[evolution-patches] gal-view-menus patch for Bonobo warning on exit

[Ettore Perazzoli <ettore ximian com>]

-- Ettore

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.100
diff -u -p -r1.100 ChangeLog
--- ChangeLog	28 Apr 2003 17:48:02 -0000	1.100
+++ ChangeLog	12 May 2003 19:34:49 -0000
@@ -1,3 +1,8 @@
+2003-05-12  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
Index: menus/gal-view-menus.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/menus/gal-view-menus.c,v
retrieving revision 1.40
diff -u -p -r1.40 gal-view-menus.c
--- menus/gal-view-menus.c	28 Apr 2003 17:48:02 -0000	1.40
+++ menus/gal-view-menus.c	12 May 2003 19:34:49 -0000
@@ -483,7 +483,8 @@ gal_view_menus_unmerge   (GalViewMenus  
 			  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);
 	}