#966 only allow translation overrides if we have a way of telling the…

… server about them

git-svn-id: https://xpra.org/svn/Xpra/trunk@10603 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/client/gtk2/client.py

@@ -199,9 +199,12 @@ def make_clipboard_helper(self):
         clipboardlog("make_clipboard_helper() options=%s, server_clipboards=%s, local clipboards=%s", clipboard_options, self.server_clipboards, CLIPBOARDS)
         #first add the platform specific one, (may be None):
         kwargs= {"clipboards.local"     : CLIPBOARDS,                   #all the local clipboards supported
-                 "clipboards.remote"    : self.server_clipboards,       #all the remote clipboards supported
+                 "clipboards.remote"    : self.server_clipboards}       #all the remote clipboards supported
+        #only allow translation overrides if we have a way of telling the server about them: 
+        if self.server_supports_clipboard_enable_selections:
+            kwargs.update({
                  "clipboard.local"      : self.local_clipboard,         #the local clipboard we want to sync to (with the translated clipboard only)
-                 "clipboard.remote"     : self.remote_clipboard}        #the remote clipboard we want to we sync to (with the translated clipboard only)
+                 "clipboard.remote"     : self.remote_clipboard})       #the remote clipboard we want to we sync to (with the translated clipboard only)
         clipboardlog("make_clipboard_helper() clipboard_options=%s, kwargs=%s", clipboard_options, kwargs)
         for classname in clipboard_options:
             module_name, _class = classname.rsplit(".", 1)

src/xpra/clipboard/translated_clipboard.py

@@ -7,7 +7,6 @@
 import os
 from xpra.clipboard.gdk_clipboard import GDKClipboardProtocolHelper
 from xpra.clipboard.clipboard_base import ClipboardProtocolHelperBase, log
-from xpra.platform.features import CLIPBOARDS
 
 
 DEFAULT_LOCAL_SELECTION     = os.environ.get("XPRA_TRANSLATEDCLIPBOARD_LOCAL_SELECTION")