diff options
| author | Mattias Andrée <maandree@kth.se> | 2017-01-13 02:55:28 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2017-01-13 02:55:28 +0100 |
| commit | c15632dc1cc5109e268df4f361e36720fab3cf77 (patch) | |
| tree | 73fdc5112b38efd57bcf37c1d3a51e93d1d0a73a | |
| parent | Work around bug in python-xlib, so new version of it can be used now that old versions cannot (diff) | |
| download | xpybar-c15632dc1cc5109e268df4f361e36720fab3cf77.tar.gz xpybar-c15632dc1cc5109e268df4f361e36720fab3cf77.tar.bz2 xpybar-c15632dc1cc5109e268df4f361e36720fab3cf77.tar.xz | |
Fix property reading for new version of python-xlib1.18.2
Signed-off-by: Mattias Andrée <maandree@kth.se>
| -rw-r--r-- | examples/compact | 4 | ||||
| -rw-r--r-- | src/plugins/xdisplay.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/compact b/examples/compact index 7e08663..9c43d36 100644 --- a/examples/compact +++ b/examples/compact @@ -277,9 +277,9 @@ class MyXMonad(Entry): UTF8_STRING = display.intern_atom('UTF8_STRING') _XMONAD_LOG = display.intern_atom('_XMONAD_LOG') _NET_DESKTOP_NAMES = display.intern_atom('_NET_DESKTOP_NAMES') - xmonad_log = display.screen().root.get_full_property(_XMONAD_LOG, UTF8_STRING).value + xmonad_log = display.screen().root.get_full_property(_XMONAD_LOG, UTF8_STRING).value.decode('utf-8', 'replace') xmonad_log = xmonad_log.split(' : ') - net_desktop_names = display.screen().root.get_full_property(_NET_DESKTOP_NAMES, UTF8_STRING).value + net_desktop_names = display.screen().root.get_full_property(_NET_DESKTOP_NAMES, UTF8_STRING).value.decode('utf-8', 'replace') net_desktop_names = net_desktop_names[:-1].split('\0') ws = 0 ws_hit = False diff --git a/src/plugins/xdisplay.py b/src/plugins/xdisplay.py index ca10f8b..722b144 100644 --- a/src/plugins/xdisplay.py +++ b/src/plugins/xdisplay.py @@ -60,5 +60,5 @@ class XDisplay: self.screen = None if self.screen == '' else int(self.screen) r = get_screen().root d = get_display() - self.vt = r.get_full_property(d.get_atom('XFree86_VT'), Xlib.Xatom.INTEGER).value[0] + self.vt = r.get_full_property(d.get_atom('XFree86_VT'), Xlib.Xatom.INTEGER).value.decode('utf-8', 'replace')[0] |