split core/minimal server functionality into a new base class

git-svn-id: https://xpra.org/svn/Xpra/trunk@4325 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Sep 11, 2013 · 8744a53 · 8744a53
1 parent 865c396
commit 8744a53
Show file tree

Hide file tree

Showing 5 changed files with 421 additions and 289 deletions.
diff --git a/src/xpra/scripts/server.py b/src/xpra/scripts/server.py
@@ -467,7 +467,8 @@ def xvfb_error(instance_exists=False):
         xvfb_pid = None     #we don't own the display
         from xpra.platform.shadow_server import ShadowServer
         app = ShadowServer()
-        app.init(sockets, opts)
+        app.init(opts)
+        app.init_sockets(sockets)
     else:
         from xpra.x11.gtk_x11 import gdk_display_source
         assert gdk_display_source
@@ -497,7 +498,8 @@ def xvfb_error(instance_exists=False):
             log.error("Xpra is a compositing manager, it cannot use a display which lacks the XComposite extension!")
             return 1
         app = XpraServer()
-        app.init(clobber, sockets, opts)
+        app.init(clobber, opts)
+        app.init_sockets(sockets)
 
 
     if xvfb_pid is not None: