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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-11-08 13:21:21 +0200 (Thu, 08 Nov 2007)
New Revision: 14737

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmenu.c
Log:
2007-11-08  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkmenu.c: add back warnings about failed grabs, they were
	for another bug.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-11-08 07:44:16 UTC (rev 14736)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-11-08 11:21:21 UTC (rev 14737)
@@ -1,3 +1,8 @@
+2007-11-08  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkmenu.c: add back warnings about failed grabs, they were
+	for another bug.
+
 2007-11-07  Michael Natterer  <mitch at imendio.com>
 
 	Merge from upstream:

Modified: projects/haf/trunk/gtk+/gtk/gtkmenu.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-08 07:44:16 UTC (rev 14736)
+++ projects/haf/trunk/gtk+/gtk/gtkmenu.c	2007-11-08 11:21:21 UTC (rev 14737)
@@ -1307,12 +1307,14 @@
 	return TRUE;
       else
 	{
+          g_warning ("popup_grab_on_window: couldn't grab keyboard");
 	  gdk_display_pointer_ungrab (gdk_drawable_get_display (window),
 				      activate_time);
 	  return FALSE;
 	}
     }
 
+  g_warning ("popup_grab_on_window: couldn't grab pointer");
   return FALSE;
 }
 
@@ -1498,6 +1500,7 @@
        */
       menu_shell->parent_menu_shell = NULL;
       menu_grab_transfer_window_destroy (menu);
+      g_warning ("gtk_menu_popup: exiting because we don't have grab");
       return;
     }