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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-03-30 13:02:15 +0300 (Fri, 30 Mar 2007)
New Revision: 10845

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

	* gtk/gtkmenuitem.c (gtk_real_menu_item_activate_item): revert to
	upstream (don't #ifdef out submenu opening) because this function
	is called on mnemonic activation, which should open submenus.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-30 09:39:10 UTC (rev 10844)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-30 10:02:15 UTC (rev 10845)
@@ -1,5 +1,11 @@
 2007-03-30  Michael Natterer  <mitch at imendio.com>
 
+	* gtk/gtkmenuitem.c (gtk_real_menu_item_activate_item): revert to
+	upstream (don't #ifdef out submenu opening) because this function
+	is called on mnemonic activation, which should open submenus.
+
+2007-03-30  Michael Natterer  <mitch at imendio.com>
+
 	Replace some MAEMO_CHANGES code with the version merged to
 	upstream trunk:
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-03-30 09:39:10 UTC (rev 10844)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-03-30 10:02:15 UTC (rev 10845)
@@ -1091,11 +1091,9 @@
 
 	  gtk_menu_shell_select_item (GTK_MENU_SHELL (widget->parent), widget); 
 
-#ifndef MAEMO_CHANGES
 	  _gtk_menu_item_popup_submenu (widget); 
 
 	  gtk_menu_shell_select_first (GTK_MENU_SHELL (menu_item->submenu), TRUE);
-#endif /* !MAEMO_CHANGES */
 	}
     }
 }