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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-08-24 16:40:14 +0300 (Mon, 24 Aug 2009)
New Revision: 19185

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkwindow.c
Log:
2009-08-24  Kristian Rietveld  <kris at lanedo.com>

	Fixes: NB#134146 - Crash while popping up CSM after device has gone to
	sleep

	* gtk/gtkwindow.c (gtk_window_client_event): only call
	delete_if_temporary if the widget actually is a temporary and mapped.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-08-24 13:01:12 UTC (rev 19184)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-24 13:40:14 UTC (rev 19185)
@@ -1,3 +1,11 @@
+2009-08-24  Kristian Rietveld  <kris at lanedo.com>
+
+	Fixes: NB#134146 - Crash while popping up CSM after device has gone to
+	sleep
+
+	* gtk/gtkwindow.c (gtk_window_client_event): only call
+	delete_if_temporary if the widget actually is a temporary and mapped.
+
 2009-08-21  Michael Natterer  <mitch at lanedo.com>
 
 	Fixes: NB#129394 Able to enter the unsupported characters in the

Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwindow.c	2009-08-24 13:01:12 UTC (rev 19184)
+++ projects/haf/trunk/gtk+/gtk/gtkwindow.c	2009-08-24 13:40:14 UTC (rev 19185)
@@ -5288,7 +5288,9 @@
   if (event->message_type == atom_temporaries)
     {
       send_client_message_to_embedded_windows (widget, atom_temporaries);
-      delete_if_temporary (widget, event);
+      if (GTK_WIDGET_MAPPED (widget)
+          && gtk_window_get_is_temporary (widget))
+        delete_if_temporary (widget, event);
     }
 #endif /* MAEMO_CHANGES */