[X2Go-Commits] [x2goclient] 02/06: src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only available on Linux, so guard new section.
git-admin at x2go.org
git-admin at x2go.org
Wed Sep 13 04:51:18 CEST 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.
commit fe558f75d6c40974794c24e634570e2ea06e1b4f
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Feb 25 04:19:22 2017 +0100
src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only available on Linux, so guard new section.
---
debian/changelog | 5 +++++
src/onmainwindow.cpp | 2 ++
2 files changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 43c1ff1..3eefe35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
+ [ Mihai Moldovan ]
+ * New upstream version (4.1.0.1):
+ - src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is
+ only available on Linux, so guard new section.
+
[ Oleksandr Shneyder ]
* New upstream version (4.1.0.1):
- Add "direct XDMCP" functionality.
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 279800c..fddb0ff 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5942,6 +5942,7 @@ void ONMainWindow::handle_xmodmap_error (QProcess &proc) {
void ONMainWindow::slotProxyError ( QProcess::ProcessError err )
{
+#ifdef Q_OS_LINUX
if(err==QProcess::FailedToStart && directRDP)
{
QString main_text = tr("Failed to start RDP or XMDCP client");
@@ -5949,6 +5950,7 @@ void ONMainWindow::slotProxyError ( QProcess::ProcessError err )
show_RichText_ErrorMsgBox (main_text, informative_text);
}
+#endif
slotProxyFinished ( -1,QProcess::CrashExit );
}
--
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