From 9d6d152922b4824d20b358b1ba97905d4d880960 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 12 Oct 2001 04:01:22 +0000 Subject: Don't die if the folder_bar_popup is %NULL. Fixes #10922. * e-shell-view.c (reparent_storage_set_view_box_and_destroy_popup): Don't die if the folder_bar_popup is %NULL. Fixes #10922. svn path=/trunk/; revision=13613 --- shell/ChangeLog | 6 ++++++ shell/e-shell-view.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 19105d1193..912e1f1acf 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2001-10-11 Ettore Perazzoli + + * e-shell-view.c + (reparent_storage_set_view_box_and_destroy_popup): Don't die if + the folder_bar_popup is %NULL. Fixes #10922. + 2001-10-11 Ettore Perazzoli * main.c (idle_cb): Display the default view only if we are diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index edb6de1f75..85adff70c4 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -394,7 +394,8 @@ reparent_storage_set_view_box_and_destroy_popup (EShellView *shell_view) priv = shell_view->priv; - g_assert (priv->folder_bar_popup != NULL); + if (priv->folder_bar_popup == NULL) + return; gtk_widget_ref (priv->storage_set_view_box); gtk_container_remove (GTK_CONTAINER (priv->folder_bar_popup), priv->storage_set_view_box); -- cgit v1.2.3