[X2Go-Commits] [x2gobroker] 04/05: use UTF-8 in zeroconf broker backend for session profile list

git-admin at x2go.org git-admin at x2go.org
Thu Apr 3 12:24:54 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit e0664d9f58fd7b303313ab361653efd115aa9c05
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 3 12:20:50 2014 +0200

    use UTF-8 in zeroconf broker backend for session profile list
---
 x2gobroker/brokers/zeroconf_broker.py |   70 ++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py
index 85328b4..2e252ac 100644
--- a/x2gobroker/brokers/zeroconf_broker.py
+++ b/x2gobroker/brokers/zeroconf_broker.py
@@ -38,40 +38,40 @@ class X2GoBroker(base.X2GoBroker):
 
         _list_of_profiles = {
             uuid.uuid4(): {
-                'user': u'',
-                'defsndport': True,
-                'useiconv': False,
-                'iconvfrom': u'UTF-8',
-                'height': 600,
-                'export': u'',
-                'quality': 9,
-                'fullscreen': False,
-                'layout': u'',
-                'useexports': 1,
-                'width': 800,
-                'speed': 2,
-                'soundsystem': u'pulse',
-                'print': True,
-                'type': u'auto',
-                'sndport': 4713,
-                'xinerama': True,
-                'variant': u'',
-                'usekbd': True,
-                'fstunnel': True,
-                'applications': [u'TERMINAL',u'WWWBROWSER',u'MAILCLIENT',u'OFFICE',],
-                'host': u'localhost',
-                'multidisp': 0,
-                'sshproxyport': 22,
-                'sound': True,
-                'rootless': 0,
-                'name': u'LOCALHOST',
-                'iconvto': u'UTF-8',
-                'soundtunnel': True,
-                'command': self.get_backend_value(self.backend_name, u'desktop-shell'),
-                'dpi': 96,
-                'sshport': 22,
-                'setdpi': 0,
-                'pack': u'16m-jpeg',
+                u'user': u'',
+                u'defsndport': True,
+                u'useiconv': False,
+                u'iconvfrom': u'UTF-8',
+                u'height': 600,
+                u'export': u'',
+                u'quality': 9,
+                u'fullscreen': False,
+                u'layout': u'',
+                u'useexports': 1,
+                u'width': 800,
+                u'speed': 2,
+                u'soundsystem': u'pulse',
+                u'print': True,
+                u'type': u'auto',
+                u'sndport': 4713,
+                u'xinerama': True,
+                u'variant': u'',
+                u'usekbd': True,
+                u'fstunnel': True,
+                u'applications': [u'TERMINAL',u'WWWBROWSER',u'MAILCLIENT',u'OFFICE',],
+                u'host': u'localhost',
+                u'multidisp': 0,
+                u'sshproxyport': 22,
+                u'sound': True,
+                u'rootless': 0,
+                u'name': u'LOCALHOST',
+                u'iconvto': u'UTF-8',
+                u'soundtunnel': True,
+                u'command': self.get_backend_value('broker_{backend}'.format(backend=self.backend_name), u'desktop-shell'),
+                u'dpi': 96,
+                u'sshport': 22,
+                u'setdpi': 0,
+                u'pack': u'16m-jpeg',
             },
         }
         list_of_profiles = {}
@@ -81,7 +81,7 @@ class X2GoBroker(base.X2GoBroker):
             list_of_profiles[profile_id] = profile
         return list_of_profiles
 
-    def select_session(self, profile_id, username=None):
+    def select_session(self, profile_id, username=None, **kwargs):
 
         selectprofile_output = {
             'server': 'localhost',

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git



More information about the x2go-commits mailing list