#1761

* remove duplicated var (did not belong in client-display)
* re-init vars during cleanup

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

src/xpra/server/source/clientdisplay_mixin.py

@@ -17,6 +17,12 @@
 class ClientDisplayMixin(StubSourceMixin):
 
     def __init__(self):
+        self.init_vars()
+
+    def cleanup(self):
+        self.init_vars()
+
+    def init_vars(self):
         self.icc = {}
         self.display_icc = {}
         self.randr_notify = False
@@ -29,9 +35,6 @@ def __init__(self):
         self.desktop_names = ()
         self.show_desktop_allowed = False
 
-    def cleanup(self):
-        pass
-
     def get_info(self):
         info = {
             "desktop_size"  : self.desktop_size or "",
@@ -42,8 +45,6 @@ def get_info(self):
         info.update(get_screen_info(self.screen_sizes))
         if self.desktop_mode_size:
             info["desktop_mode_size"] = self.desktop_mode_size
-        if self.client_connection_data:
-            info["connection-data"] = self.client_connection_data
         if self.desktop_size_unscaled:
             info["desktop_size"] = {"unscaled" : self.desktop_size_unscaled}
         return info

src/xpra/server/source/clientinfo_mixin.py

@@ -19,6 +19,12 @@
 class ClientInfoMixin(StubSourceMixin):
 
     def __init__(self):
+        self.init_vars()
+
+    def cleanup(self):
+        self.init_vars()
+
+    def init_vars(self):
         self.uuid = ""
         self.machine_id = ""
         self.hostname = ""