Changeset 1225 in xpra

Timestamp:

07/31/12 08:19:03 (10 months ago)

Author:

antoine

Message:

better handling for "MULTIPLE": use a dedicated method and log a more useful error message if it is not an atom as we expect it to be

File:

• trunk/src/wimpiggy/prop.py (modified) (2 diffs)

trunk/src/wimpiggy/prop.py

@@ -182 +182 @@
         return  None
     return str(pyatom)
+
+def _get_multiple(disp, d):
+    uint_struct = struct.Struct("=I")
+    log("get_multiple struct size=%s, len(%s)=%s", uint_struct.size, d, len(d))
+    if len(d)!=uint_struct.size and False:
+        log.info("get_multiple value is not an atom: %s", d)
+        return  str(d)
+    return _get_atom(disp, d)
 
 def get_xsettings(disp, d):
@@ -244 +252 @@
     # AnyPropertyType and assume that what you get is a bunch of pairs of
     # atoms.
-    "multiple-conversion": (str, 0, 32, unsupported, _get_atom, None),
+    "multiple-conversion": (str, 0, 32, unsupported, _get_multiple, None),
     }