Changeset 1266 in xpra

Timestamp:

08/03/12 12:14:52 (10 months ago)

Author:

antoine

Message:

only set 'xsettings-tuple' after actually checking that we do support it, and only log an error when on posix systems (others probably do not care)

File:

• trunk/src/xpra/client_base.py (modified) (3 diffs)

trunk/src/xpra/client_base.py

@@ -5 +5 @@
 # later version. See the file COPYING for details.
 
+import os
 import sys
 from wimpiggy.gobject_compat import import_gobject
@@ -121 +122 @@
         capabilities["rencode"] = has_rencode
         capabilities["server-window-resize"] = True
-        capabilities["xsettings-tuple"] = True
+        try:
+            from wimpiggy.prop import set_xsettings_format
+            assert set_xsettings_format
+            capabilities["xsettings-tuple"] = True
+        except:
+            pass
         capabilities["randr_notify"] = False    #only client.py cares about this
         return capabilities
@@ -181 +187 @@
             set_xsettings_format(use_tuple=capabilities.get("xsettings-tuple", False))
         except Exception, e:
-            log.info("failed to set xsettings format: %s", e)
+            if os.name=="posix":
+                log.err("failed to set xsettings format: %s", e)
         if not is_compatible_with(self._remote_version):
             self.quit(4)