[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.10-95-g3bb8542

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:31:24 CET 2014


The branch, build-baikal has been updated
       via  3bb8542118d12a81d4017908337d1ce39e9e2eb8 (commit)
      from  a853ca8373782108de71c4a24189e0d60703ac98 (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:
 x2go/defaults.py |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 58a0615..15ea901 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -179,33 +179,33 @@ X2GO_CLIENTSETTINGS_DEFAULTS = {
         'server': 'localhost',
         'port1': 0,
         'port2': 0,
-        },
+    },
     'General': {
         # clientport is not needed for Python X2go
         'clientport': 22, 
         'autoresume': True,
-        },
+    },
     'Authorization': {
         'newprofile': True,
         'suspend': True,
         'editprofile': True,
         'resume': True
-        },
+    },
     'trayicon': {
         'enabled': True,
         'mintotray': True,
         'noclose': True,
         'mincon': True,
         'maxdiscon': True,
-        },
-    }
+    },
+}
 X2GO_CLIENTPRINTING_DEFAULTS = {
     'General': {
         # showdialog will result in a print action that allows opening a print dialog box
         'showdialog': False,
         # if true, open a PDF viewer (or save as PDF file). If false, print via CUPS or print command
         'pdfview': True,
-        },
+    },
     'print': {
         # If false, print via CUPS. If true, run "command" to process the print job
         'startcmd': False,
@@ -215,7 +215,7 @@ X2GO_CLIENTPRINTING_DEFAULTS = {
         'stdin': False,
         # ignored in Python X2go
         'ps': False,
-        },
+    },
     'save': {
         # a path relative to the user's home directory
         'folder': 'PDF',
@@ -227,13 +227,13 @@ X2GO_CLIENTPRINTING_DEFAULTS = {
         'open': True,
         # command to execute as PDF viewer
         'command': 'xpdf',
-        },
+    },
     'CUPS': {
         # default print queue for CUPS, if print queue does not exist, the default 
         # CUPS queue is detected
         'defaultprinter': 'PDF',
-        },
-    }
+    },
+}
 if X2GOCLIENT_OS == 'Windows':
     X2GO_CLIENTPRINTING_DEFAULTS['print'].update({'gsprint': os.path.join(os.environ['ProgramFiles'], 'GhostGum', 'gsview', 'gsprint.exe'), })
 
@@ -250,7 +250,7 @@ if X2GOCLIENT_OS == 'Windows':
             'test_installed': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'),
             'run_command': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'),
             'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ],
-            },
+        },
         'VcXsrv': {
             'display': 'localhost:40',
             'last_display': 'localhost:40',
@@ -258,7 +258,7 @@ if X2GOCLIENT_OS == 'Windows':
             'test_installed': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'), 
             'run_command': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'),
             'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ],
-            },
+        },
         'VcXsrv_shipped': {
             'display': 'localhost:40',
             'last_display': 'localhost:40',
@@ -266,7 +266,7 @@ if X2GOCLIENT_OS == 'Windows':
             'test_installed': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 
             'run_command': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'),
             'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ],
-            },
+        },
         'VcXsrv_development': {
             'display': 'localhost:40',
             'last_display': 'localhost:40',
@@ -274,7 +274,7 @@ if X2GOCLIENT_OS == 'Windows':
             'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), 
             'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), 
             'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ],
-            },
+        },
         'Xming': {
             'display': 'localhost:40',
             'last_display': 'localhost:40',
@@ -282,8 +282,8 @@ if X2GOCLIENT_OS == 'Windows':
             'test_installed': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'), 
             'run_command': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'),
             'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ],
-            },
-        }
+        },
+    }
 else:
     # make the variable available when building API documentation with epydoc
     X2GO_CLIENTXCONFIG_DEFAULTS = {}
@@ -310,7 +310,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
     'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '',
     'print': False,
     'xdmcpserver': 'localhost',
-    }
+}
 """L{X2goSessionProfiles} default values to fill a new session profile with."""
 ##
 ## X2Go Proxy defaults


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