initialize rfb server early, it doesn't use command line options

git-svn-id: https://xpra.org/svn/Xpra/trunk@19469 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 26, 2018 · 0e13056 · 0e13056
1 parent f962979
commit 0e13056
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/xpra/server/rfb/rfb_server.py b/src/xpra/server/rfb/rfb_server.py
@@ -21,7 +21,7 @@
 """
 class RFBServer(object):
 
-    def init(self):
+    def __init__(self):
         self.readonly = False
         self.rfb_buttons = 0
         self.x11_keycodes_for_keysym = {}

diff --git a/src/xpra/x11/desktop_server.py b/src/xpra/x11/desktop_server.py
@@ -266,14 +266,14 @@ class XpraDesktopServer(gobject.GObject, RFBServer, X11ServerBase):
 
     def __init__(self):
         gobject.GObject.__init__(self)
+        RFBServer.__init__(self)
         X11ServerBase.__init__(self)
         self.session_type = "desktop"
         self.resize_timer = None
         self.resize_value = None
 
     def init(self, opts):
         X11ServerBase.init(self, opts)
-        RFBServer.init(self)
         if not parse_bool("rfb-upgrade", opts.rfb_upgrade):
             self._rfb_upgrade = 0
         else: