[maemo-commits] [maemo-commits] r9511 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-02-01 16:03:21 +0200 (Thu, 01 Feb 2007)
New Revision: 9511

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
Log:
2007-02-01  Michael Natterer  <mitch at imendio.com>

	Merge from upstream trunk:

	* gtk/gtkmenu.c (gtk_menu_button_press)
	(gtk_menu_button_release)
	(gtk_menu_button_scroll): remove redundant and confusing
	if (GTK_IS_MENU (widget)) checks because "widget" is always a
	GtkMenu here.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-01 12:41:03 UTC (rev 9510)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-01 14:03:21 UTC (rev 9511)
@@ -1,3 +1,13 @@
+2007-02-01  Michael Natterer  <mitch at imendio.com>
+
+	Merge from upstream trunk:
+
+	* gtk/gtkmenu.c (gtk_menu_button_press)
+	(gtk_menu_button_release)
+	(gtk_menu_button_scroll): remove redundant and confusing
+	if (GTK_IS_MENU (widget)) checks because "widget" is always a
+	GtkMenu here.
+
 Thu Feb  1 13:19:58 2007  Tim Janik  <timj at imendio.com>
 
         * gtk/gtkcombobox.c: added ::autodimmed_button style proeprty to 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-02-01 12:41:03 UTC (rev 9510)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-02-01 14:03:21 UTC (rev 9511)
@@ -2660,30 +2660,25 @@
 }
 
 static gboolean
-gtk_menu_button_scroll (GtkWidget      *widget,
+gtk_menu_button_scroll (GtkMenu        *menu,
                         GdkEventButton *event)
 {
-  if (GTK_IS_MENU (widget))
+  if (menu->upper_arrow_prelight || menu->lower_arrow_prelight)
     {
-      GtkMenu *menu = GTK_MENU (widget);
+      GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (menu));
+      gboolean     touchscreen_mode;
 
-      if (menu->upper_arrow_prelight || menu->lower_arrow_prelight)
-        {
-          GtkSettings *settings = gtk_widget_get_settings (widget);
-          gboolean     touchscreen_mode;
+      g_object_get (G_OBJECT (settings),
+                    "gtk-touchscreen-mode", &touchscreen_mode,
+                    NULL);
 
-          g_object_get (G_OBJECT (settings),
-                        "gtk-touchscreen-mode", &touchscreen_mode,
-                        NULL);
+      if (touchscreen_mode)
+        gtk_menu_handle_scrolling (menu,
+                                   event->x_root, event->y_root,
+                                   event->type == GDK_BUTTON_PRESS,
+                                   FALSE);
 
-          if (touchscreen_mode)
-            gtk_menu_handle_scrolling (menu,
-                                       event->x_root, event->y_root,
-                                       event->type == GDK_BUTTON_PRESS,
-                                       FALSE);
-
-          return TRUE;
-        }
+      return TRUE;
     }
 
   return FALSE;
@@ -2698,7 +2693,7 @@
 
   /* Don't pop down the menu for presses over scroll arrows
    */
-  if (gtk_menu_button_scroll (widget, event))
+  if (gtk_menu_button_scroll (GTK_MENU (widget), event))
     return TRUE;
 
   return GTK_WIDGET_CLASS (gtk_menu_parent_class)->button_press_event (widget, event);
@@ -2708,15 +2703,12 @@
 gtk_menu_button_release (GtkWidget      *widget,
 			 GdkEventButton *event)
 {
-  if (GTK_IS_MENU (widget))
-    {
-      GtkMenuPrivate *priv = gtk_menu_get_private (GTK_MENU (widget));
+  GtkMenuPrivate *priv = gtk_menu_get_private (GTK_MENU (widget));
 
-      if (priv->ignore_button_release)
-        {
-          priv->ignore_button_release = FALSE;
-          return FALSE;
-        }
+  if (priv->ignore_button_release)
+    {
+      priv->ignore_button_release = FALSE;
+      return FALSE;
     }
 
   if (event->type != GDK_BUTTON_RELEASE)
@@ -2724,7 +2716,7 @@
 
   /* Don't pop down the menu for releases over scroll arrows
    */
-  if (gtk_menu_button_scroll (widget, event))
+  if (gtk_menu_button_scroll (GTK_MENU (widget), event))
     return TRUE;
 
   return GTK_WIDGET_CLASS (gtk_menu_parent_class)->button_release_event (widget, event);