From d4b1e549f69674ab8c3d36f6ffe2b116269b9032 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 16 Apr 2003 14:47:06 +0000 Subject: (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 --- widgets/misc/ChangeLog | 6 ++++++ widgets/misc/e-search-bar.c | 3 +++ 2 files changed, 9 insertions(+) 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 + + * 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 * 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); } -- cgit