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.

diff --git a/ChangeLog b/ChangeLog
index 6ccd9b475c5844c97a35aa69bc3eb62bd336342d..afd850abcbe054a9b5c680e9ff1a924a8f30c228 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,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:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ccd9b475c5844c97a35aa69bc3eb62bd336342d..afd850abcbe054a9b5c680e9ff1a924a8f30c228 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,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:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6ccd9b475c5844c97a35aa69bc3eb62bd336342d..afd850abcbe054a9b5c680e9ff1a924a8f30c228 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,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:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6ccd9b475c5844c97a35aa69bc3eb62bd336342d..afd850abcbe054a9b5c680e9ff1a924a8f30c228 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,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:

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 907a1b5fabe257668efbaddb9963331879fbe168..45c24d13ab41f5d48a43a0a07974e37e535f2b6d 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/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);