[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.27.0-2-g739726a

[X2Go dev team]

The branch, twofactorauth has been updated
  discards  7e75299dd76b1392417201a4c1dae375378d1388 (commit)
  discards  7b59e71ebf7c36258d573ebd835afafc95ecc205 (commit)
       via  739726ae3ca8e9905b5bd05753fdf02a83378b3a (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (7e75299dd76b1392417201a4c1dae375378d1388)
            \
             N -- N -- N (739726ae3ca8e9905b5bd05753fdf02a83378b3a)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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_0.0.27.0.orig.tar.gz.delta |  Bin 4465 -> 0 bytes
 pyhoca-gui_0.0.27.0.orig.tar.gz.id    |    1 -
 pyhoca/wxgui/basepath.py              |    5 ++++-
 pyhoca/wxgui/frontend.py              |    3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 pyhoca-gui_0.0.27.0.orig.tar.gz.delta
 delete mode 100644 pyhoca-gui_0.0.27.0.orig.tar.gz.id

The diff of changes is:
diff --git a/pyhoca-gui_0.0.27.0.orig.tar.gz.delta b/pyhoca-gui_0.0.27.0.orig.tar.gz.delta
deleted file mode 100644
index 0c15069..0000000
Binary files a/pyhoca-gui_0.0.27.0.orig.tar.gz.delta and /dev/null differ
diff --git a/pyhoca-gui_0.0.27.0.orig.tar.gz.id b/pyhoca-gui_0.0.27.0.orig.tar.gz.id
deleted file mode 100644
index 224d3da..0000000
--- a/pyhoca-gui_0.0.27.0.orig.tar.gz.id
+++ /dev/null
@@ -1 +0,0 @@
-98b591c127312c76f50968d9f5604d3fe08733cc
diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py
index 9b11e0a..9fdebbc 100644
--- a/pyhoca/wxgui/basepath.py
+++ b/pyhoca/wxgui/basepath.py
@@ -29,7 +29,8 @@ if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOP
         _locale_location = os.path.join(_base_location, 'locale')
     else:
         _locale_location = os.path.join(_base_location, 'build', 'mo')
-        _nxproxy_location = os.path.join(_base_location, 'contrib', 'nxproxy-mswin', 'nxproxy.exe')
+        _nxproxy_location = os.path.join(_base_location, '..', 'pyhoca-contrib', 'mswin', 'nxproxy-mswin', 'nxproxy.exe')
+        _pulseaudio_location = os.path.join(_base_location, '..', 'pyhoca-contrib', 'mswin', 'pulseaudio-mswin', 'pulseaudio-0.9.6', 'pulseaudio.exe')
 else:
     if _X2GOCLIENT_OS == 'Windows':
         _base_location = os.path.abspath(os.path.curdir)
@@ -37,6 +38,7 @@ else:
         _images_location = os.path.join(_base_location, 'img')
         _locale_location = os.path.join(_base_location, 'mo')
         _nxproxy_location = os.path.join(_base_location, 'nxproxy', 'nxproxy.exe')
+        _pulseaudio_location = os.path.join(_base_location, 'pulseaudio', 'pulseaudio.exe')
     else:
         _icons_location = '/usr/share/icons'
         _images_location = '/usr/share/pyhoca/img'
@@ -46,4 +48,5 @@ icons_basepath = _icons_location
 images_basepath = _images_location
 if _X2GOCLIENT_OS == 'Windows':
     nxproxy_binary = _nxproxy_location
+    pulseaudio_binary = _pulseaudio_location
 locale_basepath = _locale_location
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 9201c1a..dd2007b 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -137,7 +137,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             _x2goclient_kwargs['start_pulseaudio'] = self.args.start_pulseaudio
             
         if x2go.X2GOCLIENT_OS == 'Windows' and self.args.start_pulseaudio and os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
-            _x2goclient_kwargs['pulseaudio_installdir'] = os.path.normpath('../../contrib/pulseaudio-mswin/pulseaudio-0.9.6')
+            print os.path.dirname(basepath.pulseaudio_binary)
+            _x2goclient_kwargs['pulseaudio_installdir'] = os.path.dirname(basepath.pulseaudio_binary)
         x2go.X2goClient.__init__(self, **_x2goclient_kwargs)
         self.SetAppName(self.appname)
         self.SetVendorName(self.vendorname)


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