[X2Go-Commits] [x2goclient] 01/18: src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only available on Linux, so guard new section.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 77cac934b9f2fbb5958c8318b111432cd1507e77
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     |    2 ++
 src/onmainwindow.cpp |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b196e17..a678c1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       will fail badly.
     - src/x2goutils.cpp: ensure that add_to_path () also processes the first
       value passed. Fixes startup problems in MacPorts.
+    - 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):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 9ef8846..2753083 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