python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-125-gec47047 - x2go-commits

14 Sep 2013

The branch, twofactorauth has been updated
       via  ec470470fb63f0451023d613943f3fbc86daeb63 (commit)
      from  b9421ed58590787180ae7069108d926a314bbda7 (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 |    1 +
 x2go/defaults.py                  |   12 ++++++------
 3 files changed, 8 insertions(+), 6 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index a9e01f8..7e7aaa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       mimeboxactions.py.
     - Run print actions in background (gevent.spawn).
     - Run MIME box actions in background (gevent.spawn).
+    - Amend list of default session options.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index f64663d..5179bdc 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -987,6 +987,7 @@ class X2goTerminalSessionSTDOUT(object):
 
         @return: X2Go session connected?
         @rtype: bool
+
         """
         return self.control_session.is_connected()
 
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 7edb59e..57e30a3 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -271,18 +271,18 @@ X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL',
 """X2go's generic applications."""
 
 X2GO_SESSIONPROFILE_DEFAULTS = {
-    'autostart': False, 'setsessiontitle': False, 'sessiontitle': "",
+    'autologin': False, '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': '',
     'useexports': True, 'fstunnel': True, 'export': '',
     'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN',
     'fullscreen': False,
-    'width': 800,'height': 600,'dpi': 96,'setdpi': False, 'xinerama': False, 
-    'usekbd':True, 'layout': 'us', 'type': 'pc105/us',
-    'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, 
-    'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png', 
-    'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22,
+    'width': 800,'height': 600,'dpi': 96,'setdpi': False, 'xinerama': False, 'multidisp': False,
+    'usekbd': True, 'layout': 'us', 'type': 'pc105/us',
+    'sound': False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713,
+    'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png',
+    'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22, 'krblogin': False,
     'rootless': True, 'applications': X2GO_GENERIC_APPLICATIONS, 'command':'TERMINAL',
     'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '',
     'print': False,


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

    