diff options
| -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); } |