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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-08-01 12:57:06 +0300 (Wed, 01 Aug 2007)
New Revision: 12977

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenuitem.c
Log:
2007-08-01  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkmenuitem.c (_gtk_menu_item_popup_submenu): sync with
	upstream (only indentation was broken, no code changes).



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-08-01 09:00:30 UTC (rev 12976)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-08-01 09:57:06 UTC (rev 12977)
@@ -1,3 +1,8 @@
+2007-08-01  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkmenuitem.c (_gtk_menu_item_popup_submenu): sync with
+	upstream (only indentation was broken, no code changes).
+
 2007-07-31  Marius Vollmer  <marius.vollmer at nokia.com>
 
  	* gtk/gtkfilesystem.h, gtk/gtkfilesystem.c [MAEMO_CHANGES]

Modified: projects/haf/trunk/gtk+/gtk/gtkmenuitem.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenuitem.c	2007-08-01 09:00:30 UTC (rev 12976)
+++ projects/haf/trunk/gtk+/gtk/gtkmenuitem.c	2007-08-01 09:57:06 UTC (rev 12977)
@@ -1105,22 +1105,22 @@
       gint popup_delay = get_popup_delay (widget);
 
       if (popup_delay > 0)
-      {
-        GdkEvent *event = gtk_get_current_event ();
+        {
+          GdkEvent *event = gtk_get_current_event ();
 
-        menu_item->timer = g_timeout_add (popup_delay,
-                                          gtk_menu_item_popup_timeout,
-                                          menu_item);
+          menu_item->timer = g_timeout_add (popup_delay,
+                                            gtk_menu_item_popup_timeout,
+                                            menu_item);
 
-        if (event &&
-            event->type != GDK_BUTTON_PRESS &&
-            event->type != GDK_ENTER_NOTIFY)
-          menu_item->timer_from_keypress = TRUE;
-        else
-          menu_item->timer_from_keypress = FALSE;
+          if (event &&
+              event->type != GDK_BUTTON_PRESS &&
+              event->type != GDK_ENTER_NOTIFY)
+            menu_item->timer_from_keypress = TRUE;
+          else
+            menu_item->timer_from_keypress = FALSE;
 
-        if (event)
-          gdk_event_free (event);
+          if (event)
+            gdk_event_free (event);
 
           return;
         }