aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-04-16 22:47:06 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-04-16 22:47:06 +0800
commitd4b1e549f69674ab8c3d36f6ffe2b116269b9032 (patch)
tree58e71b04459ce3fe7e54d0aaac573d8bad2c3cf3
parentfaf463a7d6d8a7f7462821d1c1576bedcb833239 (diff)
downloadgsoc2013-evolution-d4b1e549f69674ab8c3d36f6ffe2b116269b9032.tar
gsoc2013-evolution-d4b1e549f69674ab8c3d36f6ffe2b116269b9032.tar.gz
gsoc2013-evolution-d4b1e549f69674ab8c3d36f6ffe2b116269b9032.tar.bz2
gsoc2013-evolution-d4b1e549f69674ab8c3d36f6ffe2b116269b9032.tar.lz
gsoc2013-evolution-d4b1e549f69674ab8c3d36f6ffe2b116269b9032.tar.xz
gsoc2013-evolution-d4b1e549f69674ab8c3d36f6ffe2b116269b9032.tar.zst
gsoc2013-evolution-d4b1e549f69674ab8c3d36f6ffe2b116269b9032.zip
(remove_bonobo_menus): Only do the actual remove
if the ui component actually has a container; this suppresses a BonoboUI warning at each folder view switch. svn path=/trunk/; revision=20861
-rw-r--r--widgets/misc/ChangeLog6
-rw-r--r--widgets/misc/e-search-bar.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index c9bfc969be..973569fb2a 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-16 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-search-bar.c (remove_bonobo_menus): Only do the actual remove
+ if the ui component actually has a container; this suppresses a
+ BonoboUI warning at each folder view switch.
+
2003-04-15 Hans Petter Jansson <hpj@ximian.com>
* e-calendar-item.c (e_calendar_item_update): Unref the metrics.
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index dd73122f98..8d8767a7fb 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -564,6 +564,9 @@ setup_bonobo_menus (ESearchBar *esb)
static void
remove_bonobo_menus (ESearchBar *esb)
{
+ if (bonobo_ui_component_get_container (esb->ui_component) == CORBA_OBJECT_NIL)
+ return;
+
bonobo_ui_component_rm (esb->ui_component, "/menu/SearchPlaceholder/Search", NULL);
}