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

[chris at sita.openmoko.org]

Author: chris
Date: 2007-10-04 18:59:42 +0200 (Thu, 04 Oct 2007)
New Revision: 3088

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:
        Fix crashing on closing applications from task manager (hopefully), 
        thanks to patch from Soeren Apel


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-10-04 16:47:46 UTC (rev 3087)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-10-04 16:59:42 UTC (rev 3088)
@@ -1,5 +1,11 @@
 2007-10-04  Chris Lord  <chris at openedhand.com>
 
+	* src/today-task-manager.c: (today_task_manager_populate_tasks):
+	Fix crashing on closing applications from task manager (hopefully),
+	thanks to patch from Soeren Apel
+
+2007-10-04  Chris Lord  <chris at openedhand.com>
+
 	* src/today-pim-journal.c: (today_pim_journal_entry_changed),
 	(today_pim_journal_entry_added_cb),
 	(today_pim_journal_entry_removed_cb):

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-10-04 16:47:46 UTC (rev 3087)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-task-manager.c	2007-10-04 16:59:42 UTC (rev 3088)
@@ -387,8 +387,15 @@
 		if (!(window = gdk_window_foreign_new_for_display (
 			display, windows[i]))) continue;
 		
+		gdk_error_trap_push ();
 		if (gdk_window_get_type_hint (window) !=
-		    GDK_WINDOW_TYPE_HINT_NORMAL) continue;
+		    GDK_WINDOW_TYPE_HINT_NORMAL) {
+			gdk_flush ();
+			gdk_error_trap_pop ();
+			continue;
+		}
+		gdk_flush ();
+		if (gdk_error_trap_pop ()) continue;
 		
                 name = window_get_name (data, windows[i]);
                 task_tile = taku_icon_tile_new ();