[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.4-118-gf374c3b

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:21:00 CET 2014


The branch, brokerclient has been updated
       via  f374c3b6f09dc326fa5205bb1c0de09804dd621d (commit)
      from  57027a93cd98ec52fac9e2d5272dffcae1382b40 (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:
 debian/changelog                  |    2 +-
 x2go/backends/terminal/_stdout.py |    5 +----
 x2go/utils.py                     |   13 +++++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ab10767..4d55322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,7 +31,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       get never used.
     - Rename control session method is_folder_sharing_available to
       is_sshfs_available.
-    - Make x2go module importable on Win32 platforms again.
+    - Draw all Xlib code into utils.py
     - Fix faking of WindowsError exception object in printactions.py and
       mimeboxactions.py.
   * Depend on python-xlib.
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index a8c27ce..1d59497 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -46,7 +46,6 @@ import x2go.x2go_exceptions as x2go_exceptions
 
 # we hide the default values from epydoc (that's why we transform them to _UNDERSCORE variables)
 from x2go.defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS
-from x2go.defaults import X_DISPLAY as _X_DISPLAY
 from x2go.defaults import LOCAL_HOME as _LOCAL_HOME
 from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
 from x2go.defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR
@@ -829,9 +828,7 @@ class X2goTerminalSessionSTDOUT(object):
             timeout -= 1
 
             if self.session_window is not None:
-                self.session_window.set_wm_name(str(self.session_title))
-                self.session_window.set_wm_icon_name(str(self.session_title))
-                _X_DISPLAY.sync()
+                utils.set_session_window_title(self.session_window)
                 break
 
             gevent.sleep(1)
diff --git a/x2go/utils.py b/x2go/utils.py
index 1ad5fd0..1a3361c 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -491,6 +491,19 @@ def find_session_window(session_name):
 
     return None
 
+def set_session_window_title(session_window):
+    """\
+    Set title of session window.
+
+    @param session_window: session window instance
+    @type session_name: C{obj}
+
+    """
+    if _X2GOCLIENT_OS != 'Windows':
+        self.session_window.set_wm_name(str(self.session_title))
+        self.session_window.set_wm_icon_name(str(self.session_title))
+        _X_DISPLAY.sync()
+
 def raise_session_window(session_window):
     """\
     Raise session window.


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