[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-74-g533f7b6

[X2go dev team]

The branch, master has been updated
       via  533f7b62f7daeb0fe272f00eb3806feab3842a8d (commit)
       via  8471f9acebab3c9078a9c4f5b310c793ec651163 (commit)
      from  4a4167b67489560ffeebf8d3e490f67d937f58d9 (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 -----------------------------------------------------------------
commit 533f7b62f7daeb0fe272f00eb3806feab3842a8d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 30 09:27:15 2011 +0100

    Add support for session window title renaming from client-side.

commit 8471f9acebab3c9078a9c4f5b310c793ec651163
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 30 08:59:07 2011 +0100

    Add ,,autostart'' parameter to default session profile parameters.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 ++
 x2go/backends/terminal/_stdout.py |    6 +++++-
 x2go/defaults.py                  |    1 +
 x2go/session.py                   |    2 +-
 x2go/utils.py                     |    2 ++
 5 files changed, 11 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 838bfef..09993b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low
     - Print access to an X2Go server is not controlled by x2goprint group membership,
       but by fuse membership.
     - Add XFCE4 support.
+    - Add ,,autostart'' parameter to default session profile parameters.
+    - Add support for session window title renaming from client-side.
 
  -- 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 27b4079..392f6d7 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -185,7 +185,7 @@ 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_type="application", snd_system='pulse', snd_port=4713, cmd=None, session_title="",
                  rdp_server=None, rdp_options=None,
                  xdmcp_server=None,
                  convert_encoding=False, server_encoding='UTF-8', client_encoding='UTF-8',
@@ -303,6 +303,7 @@ class X2goTerminalSessionSTDOUT(object):
         self.params.update()
 
         self.profile_name = profile_name
+        self.session_title = session_title
         self.proxy_backend = proxy_backend
 
         self.snd_port = snd_port
@@ -926,6 +927,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.session_title:
+            cmd_line = ['X2GO_SESSION_WINDOW_TITLE="%s" ' % self.session_title] + cmd_line
+
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)
 
         _stdout = stdout.read()
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 816c648..40aeaf4 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -265,6 +265,7 @@ X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL',
 """X2go's generic applications."""
 
 X2GO_SESSIONPROFILE_DEFAULTS = {
+    'autostart': 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 faf2598..6b1824e 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',
+                        'cmd', '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 cbc607b..e807bfa 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -162,6 +162,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
             'sshproxyuser': 'sshproxy_user',
             'sshproxykeyfile': 'sshproxy_key_filename',
             'sshproxytunnel': 'sshproxy_tunnel',
+            'sessiontitle': 'session_title',
     }
     _speed_dict = {
             '0': 'modem',
@@ -255,6 +256,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
             'defsndport',
             'icon',
             'applications',
+            'autostart',
     ]
     for i in _ignored_options:
         del _params[i]


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