[X2Go-Commits] [x2goclient] 02/02: src/sharewidget.cpp: fix compile on UNIX-like platforms by defaulting to ISO-8859-1 not just on Linux but also other platforms. Fixes:#1124.
git-admin at x2go.org
git-admin at x2go.org
Fri Dec 9 20:21:21 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 94941175cd5c89bf4b27f1635cb05e2b01b1b67e
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Dec 9 20:18:41 2016 +0100
src/sharewidget.cpp: fix compile on UNIX-like platforms by defaulting to ISO-8859-1 not just on Linux but also other platforms. Fixes:#1124.
---
debian/changelog | 2 ++
src/sharewidget.cpp | 6 ++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4ad9a49..9c0c954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
printSshDError_noHostPubKey ().
- src/sshmasterconnection.cpp: add SecurID prompt to challenge auth code
prompts.
+ - src/sharewidget.cpp: fix compile on UNIX-like platforms by defaulting to
+ ISO-8859-1 not just on Linux but also other platforms. Fixes: #1124.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/sharewidget.cpp b/src/sharewidget.cpp
index 254eb58..8275f15 100644
--- a/src/sharewidget.cpp
+++ b/src/sharewidget.cpp
@@ -284,11 +284,9 @@ void ShareWidget::setDefaults()
#ifdef Q_OS_WIN
QString fromCode=tr ( "WINDOWS-1252" );
-#endif
-#ifdef Q_OS_DARWIN
+#elif defined (Q_OS_DARWIN)
QString fromCode="UTF-8";
-#endif
-#ifdef Q_OS_LINUX
+#else
QString fromCode=tr ( "ISO8859-1" );
#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