[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.2-7-g02d04cd

[X2Go dev team]

The branch, master has been updated
       via  02d04cd1091d8d6a70179aded3d06530b563806d (commit)
      from  e37cf30ac733217310dc6e516aa3b49063ab79c2 (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 -----------------------------------------------------------------
commit 02d04cd1091d8d6a70179aded3d06530b563806d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Dec 30 01:18:13 2013 +0100

    Fix scan for pulseaudio cookie file. Issue got introduced in X2Go Client 4.0.1.2 and let pulseaudio sound setup fail completely in the Linux X2Go Client of that version. (Fixes: #384).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    6 ++++++
 onmainwindow.cpp |    8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6a3ef6b..7add7c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,12 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low
   * New upstream version (4.0.1.3):
     - Protect x2goplugin.html. Make it only available from the local host.
 
+  [ Mike Gabriel ]
+  * New upstream version (4.0.1.3):
+    - Fix scan for pulseaudio cookie file. Issue got introduced in X2Go Client
+      4.0.1.2 and let pulseaudio sound setup fail completely in the Linux
+      X2Go Client of that version. (Fixes: #384).
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 17 Dec 2013 15:34:49 +0100
 
 x2goclient (4.0.1.2-0x2go2) unstable; urgency=low
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 61f6458..b49230c 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5109,11 +5109,11 @@ void ONMainWindow::slotRetResumeSess ( bool result,
             else
             {
 #ifndef Q_OS_WIN
-                if ( QFile::exists(homeDir+".config/pulse/cookie") ) {
-                    pulsecookie_filename = homeDir+".config/pulse/cookie";
+                if ( QFile::exists(homeDir+"/.config/pulse/cookie") ) {
+                    pulsecookie_filename = homeDir+"/.config/pulse/cookie";
                 }
-                else if ( QFile::exists(homeDir+".pulse-cookie") ) {
-                    pulsecookie_filename = homeDir+".pulse-cookie";
+                else if ( QFile::exists(homeDir+"/.pulse-cookie") ) {
+                    pulsecookie_filename = homeDir+"/.pulse-cookie";
                 }
                 if ( pulsecookie_filename.length() > 0 )
                 {


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).