aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-09-29 05:53:33 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-09-29 05:53:33 +0800
commite77919dfff8b7e026cb259572589b46d4a3a6e25 (patch)
treeeff9207ce3045b898c82aa9b588cd0c88291ac99
parent564c06f69d3de76e62687137306316de4ee09a87 (diff)
downloadgsoc2013-evolution-e77919dfff8b7e026cb259572589b46d4a3a6e25.tar
gsoc2013-evolution-e77919dfff8b7e026cb259572589b46d4a3a6e25.tar.gz
gsoc2013-evolution-e77919dfff8b7e026cb259572589b46d4a3a6e25.tar.bz2
gsoc2013-evolution-e77919dfff8b7e026cb259572589b46d4a3a6e25.tar.lz
gsoc2013-evolution-e77919dfff8b7e026cb259572589b46d4a3a6e25.tar.xz
gsoc2013-evolution-e77919dfff8b7e026cb259572589b46d4a3a6e25.tar.zst
gsoc2013-evolution-e77919dfff8b7e026cb259572589b46d4a3a6e25.zip
[Fix #8053, `GNOME_Evolution_Shortcuts' doesn't seem to work.]
* e-shell.c (e_shell_construct): Don't create the EShortcuts object a second time. svn path=/trunk/; revision=13236
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell.c10
2 files changed, 7 insertions, 10 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 9ff726afad..0a4dc9876b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,12 @@
2001-09-28 Ettore Perazzoli <ettore@ximian.com>
+ [Fix #8053, `GNOME_Evolution_Shortcuts' doesn't seem to work.]
+
+ * e-shell.c (e_shell_construct): Don't create the EShortcuts
+ object a second time.
+
+2001-09-28 Ettore Perazzoli <ettore@ximian.com>
+
[Fix #8434, Shortcut bar not shown properly.]
* e-shell-view.c (e_shell_view_show_shortcut_bar): Set the
diff --git a/shell/e-shell.c b/shell/e-shell.c
index cb04e01249..562893a4a3 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1026,16 +1026,6 @@ e_shell_construct (EShell *shell,
exit (0);
}
- shortcut_path = g_concat_dir_and_file (local_directory, "shortcuts.xml");
- priv->shortcuts = e_shortcuts_new (priv->storage_set,
- priv->folder_type_registry,
- shortcut_path);
- g_assert (priv->shortcuts != NULL);
-
- if (e_shortcuts_get_num_groups (priv->shortcuts) == 0)
- e_shortcuts_add_default_group (priv->shortcuts);
-
- g_free (shortcut_path);
priv->is_initialized = TRUE;