From be07467191d67eefb95fe9e435e3df8fb15df163 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 21 Jul 2000 23:36:11 +0000 Subject: Fix a braino that caused Evolution to unref a NULL object when the shortcut file was not found. svn path=/trunk/; revision=4272 --- shell/ChangeLog | 5 +++++ shell/e-shell.c | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index e9db916d73..d2186f0230 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2000-07-22 Ettore Perazzoli + + * e-shell.c (e_shell_construct): Don't unref NULL shortcuts, you + idiot. + 2000-07-22 Ettore Perazzoli * e-shell-view.c (e_shell_view_set_folder_bar_mode): Make the 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); } -- cgit v1.2.3