[X2Go-Commits] [x2goclient] 04/04: configdialog.cpp: return empty strings as paths to the XQuartz application if no valid one could be found in order to show the proper error message.

[git-admin at x2go.org]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit f5443ca999dde687a328ea08889617461dc89cf4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 12 06:01:15 2015 +0100

    configdialog.cpp: return empty strings as paths to the XQuartz application if no valid one could be found in order to show the proper error message.
---
 debian/changelog     |    3 +++
 src/configdialog.cpp |    9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3ef34b2..c562c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -215,6 +215,9 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - configdialog.cpp: use new helper function show_RichText_WarningMsgBox to
       show proper errors. Format as HTML. Use hyperlinks. Rephrase XQuartz
       warning messages.
+    - configdialog.cpp: return empty strings as paths to the XQuartz
+      application if no valid one could be found in order to show the proper
+      error message.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 13:25:28 +0100
 
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index de348a9..6311dfb 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -480,7 +480,11 @@ QString ConfigDialog::findXDarwin ( QString& version, QString path )
             ver2 = vst.value ("CFBundleShortVersionString",
                              (QVariant) "0.0.0").toString ();
         }
-        if (retMaxXDarwinVersion (ver1, ver2) == ver1) {
+        if ((ver1.compare (ver2) == 0) &&
+            (ver1.compare (QString ("0.0.0")) == 0)) {
+          return (QString ());
+        }
+        else if (retMaxXDarwinVersion (ver1, ver2) == ver1) {
             version = ver1;
             return dir1;
         }
@@ -497,6 +501,9 @@ QString ConfigDialog::findXDarwin ( QString& version, QString path )
             version=vst.value ("CFBundleShortVersionString",
                                (QVariant) "0.0.0").toString ();
         }
+        else {
+            path = QString ();
+        }
         return path;
     }
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git