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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-07-25 15:34:18 +0300 (Wed, 25 Jul 2007)
New Revision: 12835

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkmain.c
Log:
2007-07-25  Xan Lopez  <xan.lopez at nokia.com>

	* gtk/gtkmain.c (gtk_main_do_event): send insensitive-press only
	if the grab widget is our ancestor. Fixes: NB#63196


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-07-25 11:52:33 UTC (rev 12834)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-07-25 12:34:18 UTC (rev 12835)
@@ -1,3 +1,8 @@
+2007-07-25  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtkmain.c (gtk_main_do_event): send insensitive-press only
+	if the grab widget is our ancestor. Fixes: NB#63196
+
 2007-07-12  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* gtk/gtkrange.c (gtk_range_class_init, draw_stepper): Replace

Modified: projects/haf/trunk/gtk+/gtk/gtkmain.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkmain.c	2007-07-25 11:52:33 UTC (rev 12834)
+++ projects/haf/trunk/gtk+/gtk/gtkmain.c	2007-07-25 12:34:18 UTC (rev 12835)
@@ -1555,7 +1555,8 @@
 
     case GDK_BUTTON_PRESS:
 #ifdef MAEMO_CHANGES
-      if (!GTK_WIDGET_IS_SENSITIVE (event_widget))
+      if (!GTK_WIDGET_IS_SENSITIVE (event_widget) &&
+          gtk_widget_is_ancestor (event_widget, grab_widget)))
         gtk_widget_insensitive_press (event_widget);
       /* fall through */
 #endif /* MAEMO_CHANGES */