x2gobroker.git - build-main (branch) updated: 0.0.1.0-75-ga53f3b6 - x2go-commits

27 Apr 2013

The branch, build-main has been updated
       via  a53f3b66d7f514295bd071871211ec82ad4d1147 (commit)
      from  cd6780f54b5ad4df8e3d83d7ecdfaca58d78cfdd (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:
 x2gobroker/uccsjson.py |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

The diff of changes is:

diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py
index efbbc32..ca61dab 100644
--- a/x2gobroker/uccsjson.py
+++ b/x2gobroker/uccsjson.py
@@ -46,8 +46,8 @@ class ManagementServer():
         """
         self.RemoteDesktopServers = []
         self.AdditionalManagementServers = []
-        self.URL = url
-        self.Name = name
+        self.URL = unicode(url)
+        self.Name = unicode(name)
 
     def set_default(self, ts_name):
         """\
@@ -57,8 +57,10 @@ class ManagementServer():
         @type ts_name: C{unicode}
 
         """
-        if isinstance(tsName, str):
-            self.DefaultServer = tsName
+        if isinstance(ts_name, str):
+            self.DefaultServer = unicode(ts_name)
+        elif isinstance(domain, unicode):
+            self.DefaultServer = ts_name
         else:
             raise TypeError("set_default expects a string argument")
 
@@ -115,7 +117,7 @@ class RDPServer():
         self.URL = unicode(host)
         self.Name = unicode(name)
         self.Protocol = u'freerdp'
-        self.DomainRequired = unicode(True)
+        self.DomainRequired = True
         self.Username = unicode(username)
         self.Password = unicode(password)
 
@@ -228,6 +230,8 @@ class X2GoServer():
 
         """
         if isinstance(session_type, str):
+            self.SessionType = unicode(session_type)
+        elif isinstance(session_type, unicode):
             self.SessionType = session_type
         else:
             raise TypeError("set_session_type() expects a string or unicode argument")


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

    