aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-05-30 14:32:14 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-05-30 14:32:14 +0800
commitbdf6f37a8afa9988de108ac207b48de01fee6141 (patch)
treee1bb51bf741648eb1acf5c72d3f5c12b28381268 /shell/e-shell.c
parent316db85df610bfbea1cd6e5ae9ab44f10d30ccb4 (diff)
downloadgsoc2013-evolution-bdf6f37a8afa9988de108ac207b48de01fee6141.tar
gsoc2013-evolution-bdf6f37a8afa9988de108ac207b48de01fee6141.tar.gz
gsoc2013-evolution-bdf6f37a8afa9988de108ac207b48de01fee6141.tar.bz2
gsoc2013-evolution-bdf6f37a8afa9988de108ac207b48de01fee6141.tar.lz
gsoc2013-evolution-bdf6f37a8afa9988de108ac207b48de01fee6141.tar.xz
gsoc2013-evolution-bdf6f37a8afa9988de108ac207b48de01fee6141.tar.zst
gsoc2013-evolution-bdf6f37a8afa9988de108ac207b48de01fee6141.zip
Added a title bar for the folder view. Removed title bar from the
shortcut view. Made shortcuts behave correctly when moved around. Also, implemented automatic re-saving of the shortcuts when they change. svn path=/trunk/; revision=3276
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r--shell/e-shell.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ec61116534..4378343973 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -351,11 +351,12 @@ e_shell_construct (EShell *shell,
setup_components (shell);
- priv->shortcuts = e_shortcuts_new (priv->storage_set, priv->folder_type_registry);
-
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);
- if (! e_shortcuts_load (priv->shortcuts, shortcut_path)) {
+ if (priv->shortcuts == NULL) {
gtk_object_unref (GTK_OBJECT (priv->shortcuts));
priv->shortcuts = NULL;