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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 92da786637a82dce2c9482ab896ba115a74ef7db
Author: Mihai Moldovan <io...@ionic.de>
Date:   Fri May 6 23:44:00 2016 +0200

    src/onmainwindow.cpp: convert QDir object to QString for further processing.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84108c7..0b189e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -265,6 +265,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/pulsemanager.cpp: let start () act as a wrapper and do nothing if
       the PA server is already running.
     - src/onmainwindow.cpp: fix compile error due to misuse of #ifdef.
+    - src/onmainwindow.cpp: convert QDir object to QString for further
+      processing.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 5e9a39f..bedc3e3 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5305,7 +5305,7 @@ void ONMainWindow::slotRetResumeSess ( bool result,
                                             "/.pulse-cookie", this, SLOT ( 
slotPCookieReady ( bool, QString,int )));
                 }
 #else /* !defined (Q_OS_WIN) && !defined (Q_OS_DARWIN) */
-                QString cooFile = QDir::toNativeSeparators (QDir 
(pulseManager->get_pulse_dir () +
+                QString cooFile = QDir::toNativeSeparators (QDir 
(pulseManager->get_pulse_dir ().absolutePath () +
                                                                   
"/.pulse-cookie").absolutePath ());
                 QString destFile="$HOME/.x2go/C-"+
                                  resumingSession.sessionId+
@@ -5322,7 +5322,7 @@ void ONMainWindow::slotRetResumeSess ( bool result,
             sshConnection->copyFile(homeDir+"/.esd_auth",
                                     "$HOME/.esd_auth" );
 #else /* defined (Q_OS_LINUX) */
-            QString cooFile = QDir::toNativeSeparators (QDir 
(pulseManager->get_pulse_dir () +
+            QString cooFile = QDir::toNativeSeparators (QDir 
(pulseManager->get_pulse_dir ().absolutePath () +
                                                               
"/.esd_auth").absolutePath ());
             QString destFile="$HOME/.esd_auth";
             sshConnection->copyFile(cooFile,

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to