r3054 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src

[chris at sita.openmoko.org]

Author: chris
Date: 2007-09-28 15:42:50 +0200 (Fri, 28 Sep 2007)
New Revision: 3054

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
Log:
        * src/today-task-manager.c: (today_task_manager_kill):
        Call gdk_flush() before gdk_error_trap_pop() - Hopefully fix crashes
        when closing other apps


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-09-27 16:45:06 UTC (rev 3053)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-09-28 13:42:50 UTC (rev 3054)
@@ -1,3 +1,9 @@
+2007-09-28  Chris Lord  <chris at openedhand.com>
+
+	* src/today-task-manager.c: (today_task_manager_kill):
+	Call gdk_flush() before gdk_error_trap_pop() - Hopefully fix crashes
+	when closing other apps
+
 2007-09-14  Thomas Wood  <thomas at openedhand.com>
 
         * src/today-pim-journal.c: (today_pim_journal_box_new): Don't try to

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-09-27 16:45:06 UTC (rev 3053)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-09-28 13:42:50 UTC (rev 3054)
@@ -563,6 +563,7 @@
 	 * http://standards.freedesktop.org/wm-spec/wm-spec-1.3.html#id2506711
 	 */
 	if (GDK_IS_WINDOW (window)) {
+		gint error;
 		XEvent ev;
 		memset(&ev, 0, sizeof(ev));
 
@@ -579,7 +580,9 @@
 			SubstructureRedirectMask, &ev);
 
 		XSync(GDK_DISPLAY(),FALSE);
-		gdk_error_trap_pop();
+		gdk_flush ();
+		if ((error = gdk_error_trap_pop ()))
+			g_warning ("Trapped X11 error %d", error);
 		
 		/* The following code looks equivalent to me, but isn't.. */
 		/*GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT);