diff options
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 7 |
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; |