aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shortcuts-view-model.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2181119809..0e845d6343 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-29 Christopher James Lahey <clahey@ximian.com>
+
+ * e-shortcuts-view-model.c (load_group_into_model): Replaced GList
+ with GSList here to fix a type mismatch.
+
2001-06-29 Ettore Perazzoli <ettore@ximian.com>
* e-shortcuts-view-model.c (load_group_into_model): Updated to
diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c
index eadf5ea9e7..0ee2c2011f 100644
--- a/shell/e-shortcuts-view-model.c
+++ b/shell/e-shortcuts-view-model.c
@@ -76,7 +76,7 @@ load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
EShortcutsViewModelPrivate *priv;
EStorageSet *storage_set;
GSList *shortcut_list;
- GList *p;
+ GSList *p;
priv = shortcuts_view_model->priv;