[X2Go-Commits] [x2goclient] 02/02: x2gosettings.cpp: let centralSettings () return false on Windows.

git-admin at x2go.org git-admin at x2go.org
Wed Dec 2 22:06:03 CET 2015


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 081b6b1a3d95169a21d58f782f7d5b7c41d385dd
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 2 22:05:52 2015 +0100

    x2gosettings.cpp: let centralSettings () return false on Windows.
---
 debian/changelog     |    1 +
 src/x2gosettings.cpp |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c618907..e5d5338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
     - {macbuild.sh,x2goclient.pro}: pass MacPorts library and include path's
       to qmake. Due to the qt4-mac's changes, we do not automatically get
       these values automatically "appended" in a usable way anymore.
+    - x2gosettings.cpp: let centralSettings () return false on Windows.
 
   [ Oleksandr Shneyder ]
   * New upstream release (4.0.5.1):
diff --git a/src/x2gosettings.cpp b/src/x2gosettings.cpp
index 943cdf0..d045ae8 100644
--- a/src/x2gosettings.cpp
+++ b/src/x2gosettings.cpp
@@ -77,6 +77,8 @@ bool X2goSettings::centralSettings()
     QDir d("/etc/x2goclient/settings");
     x2goDebug<<d.exists();
     return d.exists();
+#else
+    return (false);
 #endif
 }
 

--
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