aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-12 12:01:22 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-12 12:01:22 +0800
commit9d6d152922b4824d20b358b1ba97905d4d880960 (patch)
tree972632bd34ff30c7a6e9268118d7d8a094388f59
parentbe75a3f952b826db123eb8a4e5e91d6164b96dd1 (diff)
downloadgsoc2013-evolution-9d6d152922b4824d20b358b1ba97905d4d880960.tar.gz
gsoc2013-evolution-9d6d152922b4824d20b358b1ba97905d4d880960.tar.zst
gsoc2013-evolution-9d6d152922b4824d20b358b1ba97905d4d880960.zip
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
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-view.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 19105d1193..912e1f1acf 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2001-10-11 Ettore Perazzoli <ettore@ximian.com>
+ * 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 <ettore@ximian.com>
+
* main.c (idle_cb): Display the default view only if we are
starting our own shell, or if the command-line has no arguments
and we are talking to an already existing shell.
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);