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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2009-06-05 10:32:08 +0300 (Fri, 05 Jun 2009)
New Revision: 18620

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
Log:
2009-06-05  Michael Natterer  <mitch at lanedo.com>

	Fixes: NB#110433 - First menu item should not be automatically
	selected

	* gtk/gtkmenu.c (gtk_menu_popup): #ifdef away the code that
	selects the first menu item in touchscreen-mode.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-06-05 07:21:48 UTC (rev 18619)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-06-05 07:32:08 UTC (rev 18620)
@@ -1,3 +1,11 @@
+2009-06-05  Michael Natterer  <mitch at lanedo.com>
+
+	Fixes: NB#110433 - First menu item should not be automatically
+	selected
+
+	* gtk/gtkmenu.c (gtk_menu_popup): #ifdef away the code that
+	selects the first menu item in touchscreen-mode.
+
 2009-06-03  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Releasing 2:2.14.3-1maemo3

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2009-06-05 07:21:48 UTC (rev 18619)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2009-06-05 07:32:08 UTC (rev 18620)
@@ -1691,6 +1691,7 @@
                              NULL);
 #endif /* MAEMO_CHANGES */
 
+#ifndef MAEMO_CHANGES
   /* if no item is selected, select the first one */
   if (!menu_shell->active_menu_item)
     {
@@ -1703,6 +1704,7 @@
       if (touchscreen_mode)
         gtk_menu_shell_select_first (menu_shell, TRUE);
     }
+#endif /* !MAEMO_CHANGES */
 
   /* Once everything is set up correctly, map the toplevel window on
      the screen.