diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-05-14 00:11:26 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-05-14 00:11:26 +0800 |
| commit | 990d1ba48a42ca1888a19844b9f9daa34f4e619b (patch) | |
| tree | 8eb0358eebec5c38b692f067e57fde697c9643f7 | |
| parent | 65fee07a39cb41746ad45c77e7daf631f6d0a47f (diff) | |
| download | gsoc2013-evolution-990d1ba48a42ca1888a19844b9f9daa34f4e619b.tar gsoc2013-evolution-990d1ba48a42ca1888a19844b9f9daa34f4e619b.tar.gz gsoc2013-evolution-990d1ba48a42ca1888a19844b9f9daa34f4e619b.tar.bz2 gsoc2013-evolution-990d1ba48a42ca1888a19844b9f9daa34f4e619b.tar.lz gsoc2013-evolution-990d1ba48a42ca1888a19844b9f9daa34f4e619b.tar.xz gsoc2013-evolution-990d1ba48a42ca1888a19844b9f9daa34f4e619b.tar.zst gsoc2013-evolution-990d1ba48a42ca1888a19844b9f9daa34f4e619b.zip | |
(gal_view_menus_unmerge): Guard against
the BonoboUIComponent not having a container to prevent a warning.
svn path=/trunk/; revision=21155
| -rw-r--r-- | widgets/ChangeLog | 5 | ||||
| -rw-r--r-- | widgets/menus/gal-view-menus.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 6233092a4b..0c83695834 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,8 @@ +2003-05-13 Ettore Perazzoli <ettore@ximian.com> + + * menus/gal-view-menus.c (gal_view_menus_unmerge): Guard against + the BonoboUIComponent not having a container to prevent a warning. + 2003-04-23 Jeffrey Stedfast <fejj@ximian.com> * menus/gal-view-menus.c (build_menus): Don't convert the label diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 39f4db3366..738c8b89be 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -483,7 +483,8 @@ gal_view_menus_unmerge (GalViewMenus *gvm, CORBA_Environment *opt_ev) { d(g_print ("%s:\n", G_GNUC_FUNCTION)); - if (bonobo_ui_component_path_exists (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev)) { + if (bonobo_ui_component_get_container (gvm->priv->component) != NULL + && bonobo_ui_component_path_exists (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev)) { d(g_print ("%s: Removing path\n", G_GNUC_FUNCTION)); bonobo_ui_component_rm (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev); } |