[maemo-commits] [maemo-commits] r12159 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-06-07 12:53:53 +0300 (Thu, 07 Jun 2007)
New Revision: 12159

Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/src/hildon-window.c
Log:
Adding a patch from Tommi Komulainen to pass the correct timestamp and button to gtk_menu_popup. Fixes MB#1466. 


Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-06-07 08:31:05 UTC (rev 12158)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-06-07 09:53:53 UTC (rev 12159)
@@ -1,3 +1,8 @@
+2007-06-07  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* src/hildon-window.c: Adding a patch from Tommi Komulainen to pass the
+	correct timestamp and button to gtk_menu_popup. Fixes MB#1466. 
+
 2007-06-07  Xan Lopez  <xan.lopez at nokia.com>
 
 	* src/hildon-window: actually, you need to use the macro always, there's

Modified: projects/haf/trunk/hildon-1/src/hildon-window.c
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-window.c	2007-06-07 08:31:05 UTC (rev 12158)
+++ projects/haf/trunk/hildon-1/src/hildon-window.c	2007-06-07 09:53:53 UTC (rev 12159)
@@ -194,7 +194,9 @@
 hildon_window_is_topmost_notify                 (HildonWindow *window);
 
 static gboolean
-hildon_window_toggle_menu                       (HildonWindow * self);
+hildon_window_toggle_menu                       (HildonWindow * self,
+						 guint button,
+						 guint32 time);
 
 static gboolean
 hildon_window_escape_timeout                    (gpointer data);
@@ -1079,7 +1081,7 @@
 
         if (xclient_message_type_check (cm, "_MB_GRAB_TRANSFER"))
         {
-            hildon_window_toggle_menu (HILDON_WINDOW ( data ));
+            hildon_window_toggle_menu (HILDON_WINDOW ( data ), cm->data.l[2], cm->data.l[0]);
             return GDK_FILTER_REMOVE;
         }
         /* opera hack clipboard client message */
@@ -1150,7 +1152,7 @@
     switch (event->keyval)
     {
         case HILDON_HARDKEY_MENU:
-            if (hildon_window_toggle_menu (HILDON_WINDOW (widget)))
+            if (hildon_window_toggle_menu (HILDON_WINDOW (widget), 0, GDK_CURRENT_TIME))
                 return TRUE;
             break;
         case HILDON_HARDKEY_ESC:
@@ -1514,7 +1516,9 @@
  * to toggle)
  */
 static gboolean
-hildon_window_toggle_menu                       (HildonWindow * self)
+hildon_window_toggle_menu                       (HildonWindow * self,
+						 guint button,
+						 guint32 time)
 {
     GtkMenu *menu_to_use = NULL;
     GList *menu_children = NULL;
@@ -1576,16 +1580,14 @@
             gtk_menu_popup (menu_to_use, NULL, NULL,
                     (GtkMenuPositionFunc)
                     hildon_window_menu_popup_func_full,
-                    self, 0, 
-                    gtk_get_current_event_time ());
+                    self, button, time);
         }
         else
         {
             gtk_menu_popup (menu_to_use, NULL, NULL,
                     (GtkMenuPositionFunc)
                     hildon_window_menu_popup_func,
-                    self, 0, 
-                    gtk_get_current_event_time ());
+                    self, button, time);
         }
         gtk_menu_shell_select_first (GTK_MENU_SHELL (menu_to_use), TRUE);
         return TRUE;