aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-07-22 07:36:11 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-07-22 07:36:11 +0800
commitbe07467191d67eefb95fe9e435e3df8fb15df163 (patch)
treefebced621e9d2a041ac53a2af17d224aec799de1
parent44230f1ef78e54ec616982b827d5f25b916de291 (diff)
downloadgsoc2013-evolution-be07467191d67eefb95fe9e435e3df8fb15df163.tar.gz
gsoc2013-evolution-be07467191d67eefb95fe9e435e3df8fb15df163.tar.zst
gsoc2013-evolution-be07467191d67eefb95fe9e435e3df8fb15df163.zip
Fix a braino that caused Evolution to unref a NULL object when the
shortcut file was not found. svn path=/trunk/; revision=4272
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index e9db916d73..d2186f0230 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2000-07-22 Ettore Perazzoli <ettore@helixcode.com>
+ * e-shell.c (e_shell_construct): Don't unref NULL shortcuts, you
+ idiot.
+
+2000-07-22 Ettore Perazzoli <ettore@helixcode.com>
+
* e-shell-view.c (e_shell_view_set_folder_bar_mode): Make the
title bar non-clickable when the folder tree is visible.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index a7c0ca8c03..09ff9285fa 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -517,12 +517,8 @@ e_shell_construct (EShell *shell,
priv->folder_type_registry,
shortcut_path);
- if (priv->shortcuts == NULL) {
- gtk_object_unref (GTK_OBJECT (priv->shortcuts));
- priv->shortcuts = NULL;
-
+ if (priv->shortcuts == NULL)
g_warning ("Cannot load shortcuts -- %s", shortcut_path);
- }
g_free (shortcut_path);
}