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

[X2Go dev team]

The branch, brokerclient has been updated
       via  05d0d3836a8c1a8ea67c14feffcc08c0e375e354 (commit)
      from  533f7b62f7daeb0fe272f00eb3806feab3842a8d (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                  |    1 +
 x2go/backends/terminal/_stdout.py |    7 ++++++-
 x2go/defaults.py                  |    2 +-
 x2go/session.py                   |    2 +-
 x2go/utils.py                     |    1 +
 5 files changed, 10 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 09993b6..c02355c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low
     - Add XFCE4 support.
     - Add ,,autostart'' parameter to default session profile parameters.
     - Add support for session window title renaming from client-side.
+    - Introduce additional session profile parameter: setsessiontitle.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Oct 2011 10:54:23 +0200
 
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 392f6d7..1861431 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -185,7 +185,8 @@ class X2goTerminalSessionSTDOUT(object):
                  geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9", 
                  cache_type="unix-kde", 
                  keyboard='', kblayout='null', kbtype='null/null',
-                 session_type="application", snd_system='pulse', snd_port=4713, cmd=None, session_title="",
+                 session_type="application", snd_system='pulse', snd_port=4713, cmd=None,
+                 set_session_title=False, session_title="",
                  rdp_server=None, rdp_options=None,
                  xdmcp_server=None,
                  convert_encoding=False, server_encoding='UTF-8', client_encoding='UTF-8',
@@ -303,6 +304,7 @@ class X2goTerminalSessionSTDOUT(object):
         self.params.update()
 
         self.profile_name = profile_name
+        self.set_session_title = set_session_title
         self.session_title = session_title
         self.proxy_backend = proxy_backend
 
@@ -927,6 +929,9 @@ class X2goTerminalSessionSTDOUT(object):
         if self.params.cmd == 'XDMCP' and self.params.xdmcp_server:
             cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line
 
+        if self.set_session_title:
+            cmd_line = ['X2GO_CLIENTFEATURE_SET_SESSIONTITLE=enabled '] + cmd_line
+
         if self.session_title:
             cmd_line = ['X2GO_SESSION_WINDOW_TITLE="%s" ' % self.session_title] + cmd_line
 
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 40aeaf4..db5b607 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -265,7 +265,7 @@ X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL',
 """X2go's generic applications."""
 
 X2GO_SESSIONPROFILE_DEFAULTS = {
-    'autostart': False, 'sessiontitle': "",
+    'autostart': False, 'setsessiontitle': False, 'sessiontitle': "",
     'speed': 2, 'pack': '16m-jpeg', 'quality': 9,
     'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False,
     'usesshproxy': False, 'sshproxyhost': '', 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '',
diff --git a/x2go/session.py b/x2go/session.py
index 6b1824e..22fcafd 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -62,7 +62,7 @@ from defaults import SUPPORTED_SOUND, SUPPORTED_PRINTING, SUPPORTED_FOLDERSHARIN
 _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack',
                         'cache_type', 'kblayout', 'kbtype',
                         'session_type', 'snd_system', 'snd_port',
-                        'cmd', 'session_title',
+                        'cmd', 'set_session_title', 'session_title',
                         'rdp_server', 'rdp_options',
                         'xdmcp_server',
                         'rootdir', 'loglevel', 'profile_name', 'profile_id',
diff --git a/x2go/utils.py b/x2go/utils.py
index e807bfa..d8109b5 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -163,6 +163,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
             'sshproxykeyfile': 'sshproxy_key_filename',
             'sshproxytunnel': 'sshproxy_tunnel',
             'sessiontitle': 'session_title',
+            'setsessiontitle': 'set_session_title',
     }
     _speed_dict = {
             '0': 'modem',


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).