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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-11-22 18:09:56 +0200 (Thu, 22 Nov 2007)
New Revision: 14818

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
Log:
2007-11-22  Xan Lopez  <xan.lopez at nokia.com>

	* gtk/gtkmenu.c (gtk_menu_popup): revert using show_now for the menu
	toplevel, it breaks submenu opening for some reason. The grab failure
	this fixed is apparently harmless anyway.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-11-22 16:09:53 UTC (rev 14817)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-11-22 16:09:56 UTC (rev 14818)
@@ -1,5 +1,11 @@
 2007-11-22  Xan Lopez  <xan.lopez at nokia.com>
 
+	* gtk/gtkmenu.c (gtk_menu_popup): revert using show_now for the menu
+	toplevel, it breaks submenu opening for some reason. The grab failure
+	this fixed is apparently harmless anyway.
+	
+2007-11-22  Xan Lopez  <xan.lopez at nokia.com>
+
 	* gtk/gtkmenu.c (gtk_menu_popup): revert last commit, it breaks in
 	some situations (menus opened on release, or opened on press with
 	button = 0 on gtk_menu_popup).

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-22 16:09:53 UTC (rev 14817)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-22 16:09:56 UTC (rev 14818)
@@ -1605,22 +1605,8 @@
   /* Once everything is set up correctly, map the toplevel window on
      the screen.
    */
-#ifndef MAEMO_CHANGES
   gtk_widget_show (menu->toplevel);
 
-  /* flush the X event queue for the popup to become realized and
-   * mapped, since grabbing requires a mapped window. (this only works
-   * for popups, regular windows need gtk_widget_show_now() to sync
-   * with window manager interaction).
-   */
-  gdk_flush ();
-#else
-  /* on maemo, menus are ordinary toplevels, so gdk_flush() will not work.
-   * do as above comment suggests instead.
-   */
-  gtk_widget_show_now (menu->toplevel);
-#endif /* MAEMO_CHANGES */
-
   if (xgrab_shell == widget)
     popup_grab_on_window (widget->window, activate_time, grab_keyboard); /* Should always succeed */
   gtk_grab_add (GTK_WIDGET (menu));