[X2Go-Commits] [x2goclient] 157/173: src/onmainwindow.cpp: convert QDir object to QString for further processing.
git-admin at x2go.org
git-admin at x2go.org
Wed Jun 1 22:25:44 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 72be1c390153c4b3232a1b2564272234b67f77ab
Author: Mihai Moldovan <ionic at 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 9c1db34..16772c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -286,6 +286,8 @@ x2goclient (4.0.5.2-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.
[ Mike DePaulo ]
* New upstream release (4.0.5.2):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 774bf2f..d580a0e 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5304,7 +5304,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+
@@ -5321,7 +5321,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
More information about the x2go-commits
mailing list