Ticket #1123: wm-test.patch

src/sugar/wm.py

@@ -23 +23 @@
 
 
 def get_activity_id(wnck_window):
+    gtk.gdk.error_trap_push()
+
     window = gtk.gdk.window_foreign_new(wnck_window.get_xid())
     prop_info = window.property_get('_SUGAR_ACTIVITY_ID', 'STRING')
+
+    if gtk.gdk.error_trap_pop():
+        raise "X Error while retrieving the _SUGAR_ACTIVITY_ID from window %i" \
+               % wnck_window.get_xid()
+
     if prop_info is None:
         return None
     else:
@@ -32 +39 @@
 
 
 def get_bundle_id(wnck_window):
+    gtk.gdk.error_trap_push()
+
     window = gtk.gdk.window_foreign_new(wnck_window.get_xid())
     prop_info = window.property_get('_SUGAR_BUNDLE_ID', 'STRING')
+
+    if gtk.gdk.error_trap_pop():
+        raise "X Error while retrieving the _SUGAR_BOUNDLE_ID from window %i" \
+               % wnck_window.get_xid()
+
     if prop_info is None:
         return None
     else:
@@ -41 +55 @@
 
 
 def set_activity_id(window, activity_id):
+    gtk.gdk.error_trap_push()
+
     window.property_change('_SUGAR_ACTIVITY_ID', 'STRING', 8,
                            gtk.gdk.PROP_MODE_REPLACE, activity_id)
 
+    if gtk.gdk.error_trap_pop():
+        raise "Could not set the _SUGAR_ACTIVITY_ID on the window to %s" \
+               % activity_id
+
 
 def set_bundle_id(window, bundle_id):
+    gtk.gdk.error_trap_push()
+
     window.property_change('_SUGAR_BUNDLE_ID', 'STRING', 8,
                            gtk.gdk.PROP_MODE_REPLACE, bundle_id)
+
+    if gtk.gdk.error_trap_pop():
+        raise "Could not set the _SUGAR_BOUNDLE_ID on the window to %s" \
+               % activity_id
+