[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 25fbdae6d78efd45b70894e673ecb95380731ef4

[X2Go dev team]

The branch, twofactorauth has been updated
       via  25fbdae6d78efd45b70894e673ecb95380731ef4 (commit)
      from  3a59422e7219a7b4bcc7c48b52b93fa9f134b842 (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:
 pyhoca-gui               |    7 ++++---
 pyhoca/wxgui/frontend.py |    1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index f85b17a..b9ab291 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -191,9 +191,10 @@ backend_options = [
                   ]
 
 if _X2GOCLIENT_OS == 'Windows':
-    xserver_options = [
+    contrib_options = [
                        {'args':['--start-xserver'], 'default': False, 'action': 'store_true', 'help': 'start the XServer before starting PyHoca-GUI, detect best XServer automatically, if more than one XServer is installed on your system', },
                        {'args':['-X', '--preferred-xserver'], 'default': None, 'metavar': 'XSERVER', 'choices': _known_xservers, 'help': 'start either of the currently supported XServers: %s -- make sure your preferred XServer is installed on your system' % _known_xservers, },
+                       {'args':['--start-pulseaudio'], 'default': False, 'action': 'store_true', 'help': 'start the PulseAudio server before starting PyHoca-GUI', },
                       ]
 
 portable_options = [
@@ -217,9 +218,9 @@ def parseargs():
     p_backendopts = p.add_argument_group('Python X2go backend options (for experts only)')
 
     if _X2GOCLIENT_OS == 'Windows':
-        p_xserveropts = p.add_argument_group('XServer options (MS Windows only)')
+        p_contribopts = p.add_argument_group('XServer options (MS Windows only)')
         p_portableopts = p.add_argument_group('File locations for portable setups (MS Windows only)')
-        _option_groups = ((p_guiopts, x2go_gui_options), (p_debugopts, debug_options), (p_xserveropts, xserver_options), (p_portableopts, portable_options), (p_backendopts, backend_options), )
+        _option_groups = ((p_guiopts, x2go_gui_options), (p_debugopts, debug_options), (p_contribopts, contrib_options), (p_portableopts, portable_options), (p_backendopts, backend_options), )
     else:
         _option_groups = ((p_guiopts, x2go_gui_options), (p_debugopts, debug_options),  (p_portableopts, portable_options), (p_backendopts, backend_options), )
     for (p_group, opts) in _option_groups:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 31e00fb..e2bef1c 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -137,6 +137,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         if x2go.X2GOCLIENT_OS == 'Windows':
                 _x2goclient_kwargs['start_xserver'] = self.args.start_xserver
+                _x2goclient_kwargs['start_pulseaudio'] = self.args.start_pulseaudio
 
         x2go.X2goClient.__init__(self, **_x2goclient_kwargs)
         self.SetAppName(self.appname)


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).