[X2go-Commits] python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.8-9-gdcee824

X2go dev team git-admin at x2go.org
Wed Nov 30 09:28:33 CET 2011


The branch, release/0.1.1.x has been updated
       via  dcee824ce2866e545658c4edaf01d24e19e1a2db (commit)
       via  5645572c71bf2c41e25996344cf39da917040404 (commit)
       via  b6f5654f0fd3ec9f827ab66d8e8dc186e4374f11 (commit)
      from  d089fd5ee17e09d8a28a1c997a43cfdd933d1d3a (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 dcee824ce2866e545658c4edaf01d24e19e1a2db
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 5645572c71bf2c41e25996344cf39da917040404
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.

commit b6f5654f0fd3ec9f827ab66d8e8dc186e4374f11
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 16 08:06:52 2011 +0100

    use public control session method to detect availability of local folder sharing

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 00c7936..fa0ebcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,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 acaef8a..e64bb1a 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
@@ -458,7 +459,7 @@ class X2goTerminalSessionSTDOUT(object):
 
         """
         if not self.control_session.is_folder_sharing_available():
-            raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username)
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
 
         # start reverse SSH tunnel for sshfs (folder sharing, printing)
         ssh_transport = self.control_session.get_transport()
@@ -506,8 +507,8 @@ class X2goTerminalSessionSTDOUT(object):
         Initialize X2go print spooling.
 
         """
-        if self.session_info.username not in self.control_session._x2go_remote_group('fuse'):
-            raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username)
+        if not self.control_session.is_folder_sharing_available():
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
 
         spool_dir = os.path.join(self.session_info.local_container, 'spool')
         if not os.path.exists(spool_dir):
@@ -552,6 +553,9 @@ class X2goTerminalSessionSTDOUT(object):
         Initialize X2go mimebox handling.
 
         """
+        if not self.control_session.is_folder_sharing_available():
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
+
         mimebox_dir = os.path.join(self.session_info.local_container, 'mimebox')
         if not os.path.exists(mimebox_dir):
             os.mkdir(mimebox_dir)
@@ -605,7 +609,7 @@ class X2goTerminalSessionSTDOUT(object):
 
         """
         if not self.control_session.is_folder_sharing_available():
-            raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username)
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
 
         if local_path is None:
             self.logger('no folder name given...', log.loglevel_WARN)
@@ -923,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 8a7aa40..8c19dd0 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 88d2a73..13fc0e1 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 9af2ef1..b0ec8cd 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).




More information about the x2go-commits mailing list