[X2Go-Commits] [x2goclient] 276/281: src/onmainwindow.cpp: convert piece of code to non-Windows and non-Darwin, so that not only Linux but other operating systems are covered as well.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 19 13:06:25 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 7442496ea7295e4d7f22682c8fd9e3d2c09df5ac
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Dec 15 09:44:17 2016 +0100
src/onmainwindow.cpp: convert piece of code to non-Windows and non-Darwin, so that not only Linux but other operating systems are covered as well.
---
debian/changelog | 3 +++
src/onmainwindow.cpp | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b2c5cc6..b8dc55c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -530,6 +530,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
GCC doesn't seem to like reassigning the pointer otherwise.
- src/unix_stdint.h: use same hack to import ssize_t into std namespace.
- src/onmainwindow.{cpp,h}: remove left-over parec references and code.
+ - src/onmainwindow.cpp: convert piece of code to non-Windows and
+ non-Darwin, so that not only Linux but other operating systems are
+ covered as well.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 89b1b81..4c5bfbe 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5373,10 +5373,10 @@ void ONMainWindow::slotRetResumeSess ( bool result,
}
if ( sndSystem==ESD )
{
-#ifdef Q_OS_LINUX
+#if !defined (Q_OS_WIN) && !defined (Q_OS_DARWIN)
sshConnection->copyFile(homeDir+"/.esd_auth",
"$HOME/.esd_auth" );
-#else /* defined (Q_OS_LINUX) */
+#else /* !defined (Q_OS_WIN) && !defined (Q_OS_DARWIN) */
QString cooFile = QDir::toNativeSeparators (QDir (pulseManager->get_pulse_dir ().absolutePath () +
"/.esd_auth").absolutePath ());
QString destFile="$HOME/.esd_auth";
--
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