Merge from 2.4:

Thu May  6 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>

	Merge from 2.4:

	* gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also
	popup the submenu for items in torn off menus.  (#122051)

diff --git a/ChangeLog b/ChangeLog
index 19f858a2be2328d1a5e3c98979aa9a698fb2d5cd..281384463c6cbc132970d3236e9335944f8f3baf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May  6 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also 
+       popup the submenu for items in torn off menus.  (#122051)
+
 2004-05-06  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 19f858a2be2328d1a5e3c98979aa9a698fb2d5cd..281384463c6cbc132970d3236e9335944f8f3baf 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu May  6 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also 
+       popup the submenu for items in torn off menus.  (#122051)
+
 2004-05-06  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 19f858a2be2328d1a5e3c98979aa9a698fb2d5cd..281384463c6cbc132970d3236e9335944f8f3baf 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu May  6 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also 
+       popup the submenu for items in torn off menus.  (#122051)
+
 2004-05-06  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 19f858a2be2328d1a5e3c98979aa9a698fb2d5cd..281384463c6cbc132970d3236e9335944f8f3baf 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu May  6 23:52:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+
+       * gtk/gtkmenuitem.c (gtk_menu_item_select_timeout): Also 
+       popup the submenu for items in torn off menus.  (#122051)
+
 2004-05-06  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 9e1a62c6757eef4b74602a83796d21f1ab8cba7a..039a6c5ef90c3089ff82bea74d3a3a8f11aecc56 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -962,7 +962,8 @@ gtk_menu_item_select_timeout (gpointer data)
 
   parent = GTK_WIDGET (menu_item)->parent;
 
-  if (parent && GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active)
+  if ((GTK_IS_MENU_SHELL (parent) && GTK_MENU_SHELL (parent)->active) || 
+      (GTK_IS_MENU (parent) && GTK_MENU (parent)->torn_off))
     {
       gtk_menu_item_popup_submenu (data);
       if (menu_item->timer_from_keypress && menu_item->submenu)