[X2Go-Commits] [x2goclient] 01/01: Remove cookie handling logic from my 2014-03-16 - 2014-03-18 commits that is no longer needed due to my last commit.

git-admin at x2go.org git-admin at x2go.org
Sun Apr 6 20:48:54 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 034afc36143134ce0fe272422bd410ca5125834e
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sun Apr 6 14:47:54 2014 -0400

    Remove cookie handling logic from my 2014-03-16 - 2014-03-18 commits that is no longer needed due to my last commit.
---
 onmainwindow.cpp |   31 ++++---------------------------
 onmainwindow.h   |    1 -
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 7249c49..c36c8bc 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5152,28 +5152,9 @@ void ONMainWindow::slotRetResumeSess ( bool result,
                                             "/.pulse-cookie", this, SLOT ( slotPCookieReady ( bool, QString,int )));
                 }
 #else
-                // The only cookie file path used by PulseAudio 2.1 and earlier.
-                // These PulseAudio versions do not support overriding the cookie file path.
-				if (pulseVersionIsLegacy)
-                    cooFile = wapiShortFileName ( homeDir )  + "/.x2go/pulse/.pulse-cookie";
-                // Default cookie file path used by PulseAudio 3.0 and later.
-                // Cannot be overriden due to PulseAudio bug 75006.
-				else
-                {
-                    if ( QFile::exists
-                        (wapiShortFileName ( homeDir )  + "/.x2go/pulse/.config/pulse/cookie") )
-                    {
-                        cooFile =
-                            (wapiShortFileName ( homeDir )  + "/.x2go/pulse/.config/pulse/cookie");
-                    }
-                    else
-                    {
-                        // PulseAudio 3.0 and later will still use this path if it exists
-                        // but the defaultt path DNE */ 
-                        cooFile = wapiShortFileName ( homeDir )  + "/.x2go/pulse/.pulse-cookie";
-                    }
-                }
-
+                QString cooFile=
+                    wapiShortFileName ( homeDir )  +
+                    "/.x2go/pulse/.pulse-cookie";
                 QString destFile="$HOME/.x2go/C-"+
                                  resumingSession.sessionId+
                                  "/.pulse-cookie";
@@ -9725,6 +9706,7 @@ void ONMainWindow::startPulsed()
     QTextStream out ( &file );
     // http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Modules/#index22h3
     // auth-cookie is relative to %USERPROFILE%
+    // Setting auth-cookie fixes bug #422
     if (pulseVersionIsLegacy)
     {
         out << "load-module module-native-protocol-tcp port="+
@@ -9747,11 +9729,6 @@ void ONMainWindow::startPulsed()
     QDir drr(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime");
     if (!drr.exists())
         drr.mkpath(drr.path());
-    /* Directory is needed for PulseAudio 3.0 and later to start successfuilly
-       when launched by X2Go Client - Fixes bug #422 */
-    QDir cooDir(homeDir+"/.x2go/pulse/.config/pulse/");
-    if (!cooDir.exists())
-        cooDir.mkpath(cooDir.path());
     if (QFile::exists(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime/pid"))
         QFile::remove(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime/pid");
     pulseDir.replace("/","\\");
diff --git a/onmainwindow.h b/onmainwindow.h
index faa2f97..1a02cf2 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -773,7 +773,6 @@ private:
     bool winSshdStarted;
     static QString u3Device;
 
-    QString cooFile;
     QString pulseVersionTestOutput;
     QProcess* pulseVersionTest;
     bool pulseVersionIsLegacy;

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git



More information about the x2go-commits mailing list