[maemo-commits] [maemo-commits] r18946 - in projects/haf/tags/gtk+/2.14.7-1maemo3: . gtk

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-07-22 14:15:22 +0300 (Wed, 22 Jul 2009)
New Revision: 18946

Modified:
   projects/haf/tags/gtk+/2.14.7-1maemo3/ChangeLog
   projects/haf/tags/gtk+/2.14.7-1maemo3/gtk/gtkmenu.c
Log:
Backport from trunk:
2009-07-20  Kristian Rietveld  <kris at lanedo.com>

	Fixes: NB#126846 - Media player crashing at
	gtk_widget_real_tap_and_hold if user open and close camera from CSM

	* gtk/gtkmenu.c (gtk_menu_window_event): Don't pass through the DELETE
	event sent by the WM to the menu.  Instead, call
	gtk_menu_shell_cancel() that will probably hide/unmap the menu.




Modified: projects/haf/tags/gtk+/2.14.7-1maemo3/ChangeLog
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo3/ChangeLog	2009-07-22 11:08:11 UTC (rev 18945)
+++ projects/haf/tags/gtk+/2.14.7-1maemo3/ChangeLog	2009-07-22 11:15:22 UTC (rev 18946)
@@ -1,3 +1,12 @@
+2009-07-20  Kristian Rietveld  <kris at lanedo.com>
+
+	Fixes: NB#126846 - Media player crashing at
+	gtk_widget_real_tap_and_hold if user open and close camera from CSM
+
+	* gtk/gtkmenu.c (gtk_menu_window_event): Don't pass through the DELETE
+	event sent by the WM to the menu.  Instead, call
+	gtk_menu_shell_cancel() that will probably hide/unmap the menu.
+
 2009-07-15  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Release 2:2.14.7-1maemo2

Modified: projects/haf/tags/gtk+/2.14.7-1maemo3/gtk/gtkmenu.c
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo3/gtk/gtkmenu.c	2009-07-22 11:08:11 UTC (rev 18945)
+++ projects/haf/tags/gtk+/2.14.7-1maemo3/gtk/gtkmenu.c	2009-07-22 11:15:22 UTC (rev 18946)
@@ -992,7 +992,12 @@
 	}
       break;
     case GDK_DELETE:
-      handled = gtk_widget_event (menu, event);
+      if (window == GTK_MENU (menu)->toplevel &&
+          GTK_WIDGET_MAPPED (GTK_MENU (menu)->toplevel))
+        {
+          gtk_menu_shell_cancel (GTK_MENU_SHELL (menu));
+          handled = TRUE;
+        }
       break;
 #endif /* MAEMO_CHANGES */
     default: