deactivate the menu before setiing it to something else. Bug #153887.

2004-10-01  Paolo Borelli  <pborelli@katamail.com>

	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
	to something else. Bug #153887.

ChangeLog

+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:

ChangeLog.pre-2-10

+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:

ChangeLog.pre-2-6

+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:

ChangeLog.pre-2-8

+2004-10-01  Paolo Borelli  <pborelli@katamail.com>
+
+	* gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it
+	to something else. Bug #153887.
+
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
 	Fix bug #150790:

gtk/gtkmenutoolbutton.c

@@ -537,6 +537,9 @@ gtk_menu_tool_button_set_menu (GtkMenuToolButton *button,
 
   if (priv->menu != GTK_MENU (menu))
     {
+      if (priv->menu && GTK_WIDGET_VISIBLE (priv->menu))
+        gtk_menu_shell_deactivate (GTK_MENU_SHELL (priv->menu));
+
       if (priv->menu)
         g_object_unref (priv->menu);