Skip to content

Commit

Permalink
the proxy server is now available on py3k (no longer depends on "serv…
Browse files Browse the repository at this point in the history
…er" availability)

git-svn-id: https://xpra.org/svn/Xpra/trunk@13940 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Sep 30, 2016
1 parent 84c6474 commit 1595ea1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ def nox():
return DISPLAY


supports_proxy = True
supports_shadow = SHADOW_SUPPORTED
supports_server = LOCAL_SERVERS_SUPPORTED
if supports_server:
Expand Down Expand Up @@ -1157,7 +1158,8 @@ def run_mode(script_file, error_cb, options, args, mode, defaults):
if mode in ("start", "start-desktop", "shadow") and display_is_remote:
#ie: "xpra start ssh:HOST:DISPLAY --start-child=xterm"
return run_remote_server(error_cb, options, args, mode, defaults)
elif (mode in ("start", "start-desktop", "upgrade", "proxy") and supports_server) or (mode=="shadow" and supports_shadow):
elif (mode in ("start", "start-desktop", "upgrade") and supports_server) or \
(mode=="shadow" and supports_shadow) or (mode=="proxy" and supports_proxy):
current_display = nox()
from xpra.scripts.server import run_server
return run_server(error_cb, options, mode, script_file, args, current_display)
Expand Down

0 comments on commit 1595ea1

Please sign in to comment.