[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 09728ed007229f2dbfc424b08ce6cd76d533eeac

[X2Go dev team]

The branch, twofactorauth has been updated
       via  09728ed007229f2dbfc424b08ce6cd76d533eeac (commit)
      from  3f31de122ce70499ee4e3cce1b2945a6b2e8cebf (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   |    8 ++++----
 x2go/pulseaudio.py |    1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 2ec07ba..7f797a2 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -140,23 +140,23 @@ BACKEND_CLIENTPRINTING_DEFAULT = 'X2goClientPrintingFILE'
 
 X2GO_SETTINGS_FILENAME = 'settings'
 X2GO_SETTINGS_CONFIGFILES = [
-    os.path.join(ETC_DIR,X2GO_SETTINGS_FILENAME),
     os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'settings'),
+    os.path.join(ETC_DIR,X2GO_SETTINGS_FILENAME),
 ]
 X2GO_PRINTING_FILENAME = 'printing'
 X2GO_PRINTING_CONFIGFILES = [
-    os.path.join(ETC_DIR,X2GO_PRINTING_FILENAME),
     os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'printing'),
+    os.path.join(ETC_DIR,X2GO_PRINTING_FILENAME),
 ]
 X2GO_SESSIONPROFILES_FILENAME = 'sessions'
 X2GO_SESSIONPROFILES_CONFIGFILES = [
-    os.path.join(ETC_DIR,X2GO_SESSIONPROFILES_FILENAME),
     os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'sessions'),
+    os.path.join(ETC_DIR,X2GO_SESSIONPROFILES_FILENAME),
 ]
 X2GO_XCONFIG_FILENAME = 'xconfig'
 X2GO_XCONFIG_CONFIGFILES = [
-    os.path.join(ETC_DIR,X2GO_XCONFIG_FILENAME),
     os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'xconfig'),
+    os.path.join(ETC_DIR,X2GO_XCONFIG_FILENAME),
 ]
 
 X2GO_CLIENTSETTINGS_DEFAULTS = {
diff --git a/x2go/pulseaudio.py b/x2go/pulseaudio.py
index d48303e..9cc8300 100644
--- a/x2go/pulseaudio.py
+++ b/x2go/pulseaudio.py
@@ -75,6 +75,7 @@ class X2goPulseAudio(threading.Thread):
         if self.path:
             cmd = os.path.join(self.path, cmd)
         cmd_options = [
+            '-D',
             '-n',
             '-L module-native-protocol-tcp port=4713',
             '-L module-esound-protocol-tcp port=16001',


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