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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-05-23 12:11:19 +0300 (Wed, 23 May 2007)
New Revision: 11767

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
   projects/haf/trunk/gtk+/gtk/gtkmenushell.c
   projects/haf/trunk/gtk+/gtk/gtkmenushell.h
Log:
2007-05-23  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkmenushell.[ch]
	* gtk/gtkmenu.c: back out _gtk_menu_shell_set_first_click() and
	its logic. Fixes NB#57827, NB#57787 and NB#57776.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-23 08:55:11 UTC (rev 11766)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-23 09:11:19 UTC (rev 11767)
@@ -1,5 +1,11 @@
 2007-05-23  Michael Natterer  <mitch at imendio.com>
 
+	* gtk/gtkmenushell.[ch]
+	* gtk/gtkmenu.c: back out _gtk_menu_shell_set_first_click() and
+	its logic. Fixes NB#57827, NB#57787 and NB#57776.
+
+2007-05-23  Michael Natterer  <mitch at imendio.com>
+
 	* gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event): remove
 	duplicate call to _gdk_event_button_generate() which was
 	introduced by GTK 2.10.12 upgrade mis-merge.

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-05-23 08:55:11 UTC (rev 11766)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-05-23 09:11:19 UTC (rev 11767)
@@ -1544,8 +1544,6 @@
                              &priv->popup_pointer_x,
                              &priv->popup_pointer_y,
                              NULL);
-
-  _gtk_menu_shell_set_first_click (menu_shell);
 #endif /* MAEMO_CHANGES */
 
   /* if no item is selected, select the first one */

Modified: projects/haf/trunk/gtk+/gtk/gtkmenushell.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2007-05-23 08:55:11 UTC (rev 11766)
+++ projects/haf/trunk/gtk+/gtk/gtkmenushell.c	2007-05-23 09:11:19 UTC (rev 11767)
@@ -135,9 +135,6 @@
 
   guint take_focus : 1;
   guint activated_submenu : 1;
-#ifdef MAEMO_CHANGES
-  guint first_click : 1;
-#endif /* MAEMO_CHANGES */
 };
 
 static void gtk_menu_shell_set_property      (GObject           *object,
@@ -387,9 +384,6 @@
   priv->key_hash = NULL;
   priv->take_focus = TRUE;
   priv->activated_submenu = FALSE;
-#ifdef MAEMO_CHANGES
-  priv->first_click = FALSE;
-#endif /* MAEMO_CHANGES */
 }
 
 static void
@@ -590,12 +584,6 @@
     }
   else
     {
-#ifdef MAEMO_CHANGES
-      GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (widget);
-
-      priv->first_click = FALSE;
-#endif /* MAEMO_CHANGES */
-
       widget = gtk_get_event_widget ((GdkEvent*) event);
       if (widget == GTK_WIDGET (menu_shell))
 	{
@@ -655,7 +643,7 @@
 	{
 	  menu_shell->button = 0;
 	  if (menu_shell->parent_menu_shell)
-	    return gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event);
+            return gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event);
 	}
 
       menu_shell->button = 0;
@@ -670,9 +658,6 @@
 
               if (submenu == NULL)
                 {
-#ifdef MAEMO_CHANGES
-                  if (!priv->first_click)
-#endif /* MAEMO_CHANGES */
                   gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE);
 
                   deactivate = FALSE;
@@ -759,17 +744,6 @@
           deactivate = FALSE;
         }
 
-#ifdef MAEMO_CHANGES
-      if (priv->first_click)
-        {
-          /* We only ever want to prevent deactivation on the first
-           * press/release. */
-          priv->first_click = FALSE;
-
-          deactivate = FALSE;
-        }
-#endif /* MAEMO_CHANGES */
-
       if (deactivate)
         {
           gtk_menu_shell_deactivate (menu_shell);
@@ -991,12 +965,6 @@
 {
   if (menu_shell->active)
     {
-#ifdef MAEMO_CHANGES
-      GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell);
-
-      priv->first_click = FALSE;
-#endif /* MAEMO_CHANGES */
-
       menu_shell->button = 0;
       menu_shell->active = FALSE;
       menu_shell->activate_time = 0;
@@ -1700,15 +1668,5 @@
     }
 }
 
-#ifdef MAEMO_CHANGES
-void
-_gtk_menu_shell_set_first_click (GtkMenuShell *menu_shell)
-{
-  GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell);
-
-  priv->first_click = TRUE;
-}
-#endif /* MAEMO_CHANGES */
-
 #define __GTK_MENU_SHELL_C__
 #include "gtkaliasdef.c"

Modified: projects/haf/trunk/gtk+/gtk/gtkmenushell.h
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenushell.h	2007-05-23 08:55:11 UTC (rev 11766)
+++ projects/haf/trunk/gtk+/gtk/gtkmenushell.h	2007-05-23 09:11:19 UTC (rev 11767)
@@ -126,10 +126,6 @@
 void     gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
                                         gboolean      take_focus);
 
-#ifdef MAEMO_CHANGES
-void    _gtk_menu_shell_set_first_click (GtkMenuShell *menu_shell);
-#endif /* MAEMO_CHANGES */
-
 G_END_DECLS
 
 #endif /* __GTK_MENU_SHELL_H__ */