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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-11-21 14:17:48 +0200 (Wed, 21 Nov 2007)
New Revision: 14804

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/debian/changelog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
Log:
Do not store activate_time in menu_shell for menus popped up with
button == 0.

Storing this is only useful for menus opened on press (for the "close on long
press" functionality), and it confuses the code responsible of the gtk-menu-popup-click-time,
which expects activate_time to be set only for menus opened on button press.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-11-21 09:46:48 UTC (rev 14803)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-11-21 12:17:48 UTC (rev 14804)
@@ -1,3 +1,17 @@
+2007-11-21  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkmenu.c (gtk_menu_popup): 
+
+	Do not store activate_time in menu_shell for menus popped up with
+	button == 0.
+
+	Storing this is only useful for menus opened on press (for the
+	"close on long press" functionality), and it confuses the code
+	responsible of the gtk-menu-popup-click-time, which expects
+	activate_time to be set only for menus opened on button press.
+
+	Fixes: NB#76238
+
 2007-11-13  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkrange.c (gtk_range_motion_notify): 

Modified: projects/haf/trunk/gtk+/debian/changelog
===================================================================
--- projects/haf/trunk/gtk+/debian/changelog	2007-11-21 09:46:48 UTC (rev 14803)
+++ projects/haf/trunk/gtk+/debian/changelog	2007-11-21 12:17:48 UTC (rev 14804)
@@ -1,3 +1,10 @@
+gtk+2.0 (2:2.10.12-0osso29) unstable; urgency=low
+
+  * Do not store activate_time for menus not opened on button_press.
+    Fixes: NB#76238 
+
+ -- Xan Lopez <xan.lopez at nokia.com>  Wed, 21 Nov 2007 13:51:49 +0200
+
 gtk+2.0 (2:2.10.12-0osso28) unstable; urgency=low
 
   * Reverting last change, Core fixed it in their side. 

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-21 09:46:48 UTC (rev 14803)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-21 12:17:48 UTC (rev 14804)
@@ -1549,7 +1549,14 @@
   menu->parent_menu_item = parent_menu_item;
   menu->position_func = func;
   menu->position_func_data = data;
+#ifdef MAEMO_CHANGES
+  /* Storing the activate_time in menu_shell is only useful for
+     menus opened in button press in order to close them on long
+     press */
+  menu_shell->activate_time = button == 0 ? 0 : activate_time;
+#else
   menu_shell->activate_time = activate_time;
+#endif
 
   /* We need to show the menu here rather in the init function because
    * code expects to be able to tell if the menu is onscreen by