[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-212-g5fd75e3

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:27:00 CET 2014


The branch, build-baikal has been updated
       via  5fd75e3eb8928b85866c6ccb97fd9d43c67f1f5e (commit)
      from  392629ed845770798e10870494951c64f4e86aca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/client.py  |    2 +-
 x2go/xserver.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index a5c4e63..468ce08 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -307,7 +307,7 @@ class X2goClient(object):
                     p_xs_name = self.client_xconfig.preferred_xserver_names[0]
                     _last_display = self.client_xconfig.get_xserver_config(p_xs_name)['last_display']
                     self.client_xconfig.detect_unused_xdisplay_port(p_xs_name)
-                    p_xs = self.client_xconfig.get_xserver_config(p_xs_name)
+                    p_xs = (p_xs_name, self.client_xconfig.get_xserver_config(p_xs_name))
                 elif type(start_xserver) is types.StringType:
                     _last_display = self.client_xconfig.get_xserver_config(start_xserver)['last_display']
                     self.client_xconfig.detect_unused_xdisplay_port(start_xserver)
diff --git a/x2go/xserver.py b/x2go/xserver.py
index 859b1c8..c97c2ee 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -203,10 +203,10 @@ class X2goClientXConfig(inifiles.X2goIniFile):
 
         """
         _default_display = self.get_xserver_config(xserver_name)['display']
-        _last_display = self.xserver_config(xserver_name)['last_display']
+        _last_display = self.get_xserver_config(xserver_name)['last_display']
 
         try:
-            _default_xserver_port = int(_display.split(":")[1].split(".")[0]) + 6000
+            _default_xserver_port = int(_default_display.split(":")[1].split(".")[0]) + 6000
             _last_xserver_port = int(_last_display.split(":")[1].split(".")[0]) + 6000
 
             # try the last used $DISPLAY first...


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list