[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.1.1-7-gcee0cac

[X2Go dev team]

The branch, master has been updated
       via  cee0cac37466c9ea792588f0a26f6842d104f8e4 (commit)
       via  917cca2a6a1dbd6cf1105cf9b5329d76a7c99758 (commit)
      from  fe173b2649c28ede9348f4ed6bc6a926ffbe303a (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 cee0cac37466c9ea792588f0a26f6842d104f8e4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 11 09:56:42 2013 +0100

    fix __doc__ string

commit 917cca2a6a1dbd6cf1105cf9b5329d76a7c99758
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 11 09:56:29 2013 +0100

    Add session profile option ,,display'' to default session profile options.

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

Summary of changes:
 debian/changelog                |    4 ++++
 x2go/backends/profiles/_file.py |    2 +-
 x2go/defaults.py                |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fd68bb4..20bd71f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ python-x2go (0.2.1.2-0~x2go1) UNRELEASED; urgency=low
       DISPLAY not being set.  It is overkill as well, causing extra dependencies
       to be installed at build time. (Fixes: #91).
 
+  [ Mike Gabriel ]
+  * New upstream version (0.2.1.2):
+    - Add session profile option ,,display'' to default session profile options.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 20 Dec 2012 08:58:44 +0100
 
 python-x2go (0.2.1.1-0~x2go1) unstable; urgency=low
diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py
index eb21f61..fbbf396 100644
--- a/x2go/backends/profiles/_file.py
+++ b/x2go/backends/profiles/_file.py
@@ -186,7 +186,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile):
         @type profile_id_or_name: C{str}
         @param parameter: if specified, only the value for the given parameter is returned
         @type parameter: C{str}
-        @param profile_id: profile ID (fast than specifying C{profile_id_or_name})
+        @param profile_id: profile ID (faster than specifying C{profile_id_or_name})
         @type profile_id: C{str}
 
         @return: the session profile configuration for the given profile ID (or name)
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 15ea901..b40fefc 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -300,7 +300,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
     'useexports': True, 'restoreexports': False, 'fstunnel': True, 'export': '',
     'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN',
     'fullscreen': False,
-    'width': 800,'height': 600, 'maxdim': False, 'dpi': 96, 'setdpi': False, 'xinerama': False, 'multidisp': False,
+    'width': 800,'height': 600, 'maxdim': False, 'dpi': 96, 'setdpi': False, 'xinerama': False, 'multidisp': False, 'display': 1,
     'usekbd': True, 'layout': 'us', 'type': 'pc105/us', 'variant': '',
     'sound': False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713,
     'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png',


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