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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-11-22 18:09:53 +0200 (Thu, 22 Nov 2007)
New Revision: 14817

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
Log:
Revert last commit.

It breaks in some situations (menus opened on release,
or opened on press with button = 0 on gtk_menu_popup).


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-11-22 12:48:04 UTC (rev 14816)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-11-22 16:09:53 UTC (rev 14817)
@@ -1,3 +1,9 @@
+2007-11-22  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkmenu.c (gtk_menu_popup): revert last commit, it breaks in
+	some situations (menus opened on release, or opened on press with
+	button = 0 on gtk_menu_popup).
+
 2007-11-21  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkmenu.c (gtk_menu_popup): 

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-22 12:48:04 UTC (rev 14816)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-22 16:09:53 UTC (rev 14817)
@@ -1549,14 +1549,7 @@
   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