[maemo-commits] [maemo-commits] r15626 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2008-06-04 14:08:15 +0300 (Wed, 04 Jun 2008)
New Revision: 15626

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenushell.c
Log:
2008-06-04  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): one part of
	the 2-12 upgrade patch got lost, making all menus behave
	unpredictable-to-unusable. Should be fixed now.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-06-04 09:34:27 UTC (rev 15625)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-06-04 11:08:15 UTC (rev 15626)
@@ -1,3 +1,9 @@
+2008-06-04  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkmenushell.c (gtk_menu_shell_button_release): one part of
+	the 2-12 upgrade patch got lost, making all menus behave
+	unpredictable-to-unusable. Should be fixed now.
+
 2008-05-23  Michael Natterer  <mitch at imendio.com>
 
 	* gdk/gdk.c (gdk_threads_add_idle_full): add some trailing

Modified: projects/haf/trunk/gtk+/gtk/gtkmenushell.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2008-06-04 09:34:27 UTC (rev 15625)
+++ projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2008-06-04 11:08:15 UTC (rev 15626)
@@ -764,6 +764,10 @@
       menu_shell->button = 0;
       menu_item = gtk_menu_shell_get_item (menu_shell, (GdkEvent*) event);
 
+      g_object_get (gtk_widget_get_settings (widget),
+                    "gtk-menu-popup-click-time", &popup_click_time,
+                    NULL);
+
       if (popup_click_time == 0 ||
           (event->time - menu_shell->activate_time) > popup_click_time)
         {