From 901a4b8caf7e2f06667191349bc0ddad612b2ecd Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Mon, 12 Dec 2011 13:55:28 +0000 Subject: wm.py: fix getting of X window properties --- 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() -- cgit v0.9.1