Use gdk to get/set X11 properties

1 files changed, 14 insertions, 10 deletions

diff --git a/lib/sugar/wm.py b/lib/sugar/wm.py
index 6610889..47356a5 100644
--- a/lib/sugar/wm.py
+++ b/lib/sugar/wm.py
@@ -17,22 +17,26 @@
 
 import gtk
 
-import _sugarext
-
 def get_activity_id(wnck_window):
     window = gtk.gdk.window_foreign_new(wnck_window.get_xid())
-    return _sugarext.x11_get_string_property(
-                            window, '_SUGAR_ACTIVITY_ID')
+    prop_info = window.property_get('_SUGAR_ACTIVITY_ID', 'STRING')
+    if prop_info is None:
+        return None
+    else:
+        return prop_info[2]
 
 def get_bundle_id(wnck_window):
     window = gtk.gdk.window_foreign_new(wnck_window.get_xid())
-    return _sugarext.x11_get_string_property(
-                            window, '_SUGAR_BUNDLE_ID')
+    prop_info = window.property_get('_SUGAR_BUNDLE_ID', 'STRING')
+    if prop_info is None:
+        return None
+    else:
+        return prop_info[2]
 
 def set_activity_id(window, activity_id):
-    _sugarext.x11_set_string_property(
-            window, '_SUGAR_ACTIVITY_ID', activity_id)
+    window.property_change('_SUGAR_ACTIVITY_ID', 'STRING', 8,
+                           gtk.gdk.PROP_MODE_REPLACE, activity_id)
 
 def set_bundle_id(window, bundle_id):
-    _sugarext.x11_set_string_property(
-            window, '_SUGAR_BUNDLE_ID', bundle_id)
+    window.property_change('_SUGAR_BUNDLE_ID', 'STRING', 8,
+                           gtk.gdk.PROP_MODE_REPLACE, bundle_id)