[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-35-g93d5e22

[X2Go dev team]

The branch, master has been updated
       via  93d5e22355bbc0b388213bfaf2454da53a0e3222 (commit)
      from  b9f22a3b34178a389d0c8ca177d622f4aa3904c7 (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 93d5e22355bbc0b388213bfaf2454da53a0e3222
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 6 12:53:58 2013 +0100

    Test for various file locations of the pulseaudio cookie file.

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

Summary of changes:
 debian/changelog |    1 +
 onmainwindow.cpp |   43 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 35 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 612e2fc..afc6267 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     - Expand tilde operator for all other file paths handed over to X2Go Client
       via sessions file or cmdline parameter.
     - Syntax fix of x2goclient.desktop file.
+    - Test for various file locations of the pulseaudio cookie file.
   * Pull-in packaging changes from Debian.
   * debian/source/format:
     + Switch to format 1.0.
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 357a298..3b5b319 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5062,21 +5062,46 @@ void ONMainWindow::slotRetResumeSess ( bool result,
                 file.close();
             }
 #endif
+            QString pulsecookie_filename = "";
             if ( sysPulse )
             {
-                sshConnection->copyFile(
-                    "/var/run/pulse/.pulse-cookie",
-                    "~/.x2go/C-"+
-                    resumingSession.sessionId+
-                    "/.pulse-cookie", this, SLOT ( slotPCookieReady ( bool, QString,int )));
+                if ( QFile::exists("/run/pulse/.config/pulse/cookie") ) {
+                    pulsecookie_filename = "/run/pulse/.config/pulse/cookie";
+                }
+                else if ( QFile::exists("/run/pulse/.pulse-cookie") ) {
+                    pulsecookie_filename = "/run/pulse/.pulse-cookie";
+                }
+                else if ( QFile::exists("/var/run/pulse/.config/pulse/cookie") ) {
+                    pulsecookie_filename = "/var/run/pulse/.config/pulse/cookie";
+                }
+                else if ( QFile::exists("/var/run/pulse/.pulse-cookie") ) {
+                    pulsecookie_filename = "/var/run/pulse/.pulse-cookie";
+                }
+                if ( pulsecookie_filename.length() > 0 )
+                {
+                    sshConnection->copyFile(
+                        pulsecookie_filename,
+                        "~/.x2go/C-"+
+                        resumingSession.sessionId+
+                        "/.pulse-cookie", this, SLOT ( slotPCookieReady ( bool, QString,int )));
+                }
             }
             else
             {
 #ifndef Q_OS_WIN
-                sshConnection->copyFile(homeDir+"/.pulse-cookie",
-                                        "~/.x2go/C-"+
-                                        resumingSession.sessionId+
-                                        "/.pulse-cookie", this, SLOT ( slotPCookieReady ( bool, QString,int )));
+                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";
+                }
+                if ( pulsecookie_filename.length() > 0 )
+                {
+                    sshConnection->copyFile(pulsecookie_filename,
+                                            "~/.x2go/C-"+
+                                            resumingSession.sessionId+
+                                            "/.pulse-cookie", this, SLOT ( slotPCookieReady ( bool, QString,int )));
+                }
 #else
                 QString cooFile=
                     wapiShortFileName ( homeDir )  +


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