Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-12-12 13:55:28 (GMT)
committer Daniel Drake <dsd@laptop.org>2011-12-12 13:55:28 (GMT)
commit901a4b8caf7e2f06667191349bc0ddad612b2ecd (patch)
treecc1f793fb2e5aa9b5cc5b7c5f67c5114c809fedb
parent18864f615180ce867ab5a5d022de9b686857709d (diff)
wm.py: fix getting of X window properties
-rw-r--r--src/sugar3/graphics/palette.py1
-rw-r--r--src/sugar3/wm.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/sugar3/graphics/palette.py b/src/sugar3/graphics/palette.py
index f5aa154..0f7e4e0 100644
--- a/src/sugar3/graphics/palette.py
+++ b/src/sugar3/graphics/palette.py
@@ -278,6 +278,7 @@ class Palette(PaletteWindow):
setter=set_icon_visible)
def set_content(self, widget):
+ logging.warning("%s", type(self._widget))
assert self._widget is None or isinstance(self._widget, _PaletteWindowWidget)
if self._widget is None:
diff --git a/src/sugar3/wm.py b/src/sugar3/wm.py
index 2e426b4..5bb661a 100644
--- a/src/sugar3/wm.py
+++ b/src/sugar3/wm.py
@@ -29,7 +29,9 @@ import logging
def _property_get_trapped(window, prop, prop_type):
Gdk.error_trap_push()
- prop_info = window.property_get(prop, prop_type)
+ prop_atom = Gdk.Atom.intern(prop, False)
+ type_atom = Gdk.Atom.intern(prop_type, False)
+ prop_info = Gdk.property_get(window, prop_atom, type_atom, 0, 9999, False)
# We just log a message
error = Gdk.error_trap_pop()