[X2Go-Commits] [x2goclient] 10/59: onmainwindow.cpp: add blocks to switch cases to fix a compile error.

[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 72bc4124e1fede24e5e7425dfaca90aa5618efb4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jun 3 02:07:49 2015 +0200

    onmainwindow.cpp: add blocks to switch cases to fix a compile error.
    
    Also correctly append to informative_text on one occasion, instead of
    overwriting it.
---
 debian/changelog     |    3 +++
 src/onmainwindow.cpp |   63 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e758b98..ea97a70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
       starting scdaemon. Fixes: #882.
     - x2goutils.h: add QMessageBox include, fixed compile error.
     - onmainwindow.cpp: fix typos leading to compile errors.
+    - onmainwindow.cpp: add blocks to switch cases to fix a compile error.
+      Also correctly append to informative_text on one occasion, instead of
+      overwriting it.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index fb73f0a..4e6f017 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -8435,31 +8435,44 @@ void ONMainWindow::slotScDaemonError (QProcess::ProcessError error) {
     QString informative_text;
 
     switch (error) {
-        case QProcess::FailedToStart: main_text += tr ("failed to start.");
-                                      informative_text = tr ("Check whether the package providing \"scdaemon\" is installed.\n"
-                                                             "The current search path is: ");
-
-                                      QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment ();
-
-                                      if (!scDaemon->processEnvironment ().isEmpty ()) {
-                                          tmp_env = scDaemon->processEnvironment ();
-                                      }
-
-                                      informative_text = tmp_env.value ("PATH", "unknown");
-                                      break;
-        case QProcess::Crashed:       main_text += tr ("started, but crashed.");
-                                      break;
-        case QProcess::Timedout:      main_text += tr ("didn't start yet.");
-                                      informative_text = tr ("This error shouldn't come up.");
-                                      break;
-        case QProcess::WriteError:    main_text += tr ("didn't accept a write operation.");
-                                      informative_text = tr ("It is probably not running correctly or crashed in-between.");
-                                      break;
-        case QProcess::ReadError:     main_text = tr ("Unable to read from scdaemon.");
-                                      informative_text = tr ("It is probably not running correctly or crashed in-between.");
-                                      break;
-        case QProcess::UnknownError:
-        default:                      main_text += tr ("experienced an unknown error.");
+        case QProcess::FailedToStart: {
+            main_text += tr ("failed to start.");
+            informative_text = tr ("Check whether the package providing \"scdaemon\" is installed.\n"
+                                   "The current search path is: ");
+
+            QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment ();
+
+            if (!scDaemon->processEnvironment ().isEmpty ()) {
+                tmp_env = scDaemon->processEnvironment ();
+            }
+
+            informative_text += tmp_env.value ("PATH", "unknown");
+            break;
+        }
+        case QProcess::Crashed: {
+            main_text += tr ("started, but crashed.");
+            break;
+        }
+        case QProcess::Timedout: {
+            main_text += tr ("didn't start yet.");
+            informative_text = tr ("This error shouldn't come up.");
+            break;
+        }
+        case QProcess::WriteError: {
+            main_text += tr ("didn't accept a write operation.");
+            informative_text = tr ("It is probably not running correctly or crashed in-between.");
+            break;
+        }
+        case QProcess::ReadError: {
+            main_text = tr ("Unable to read from scdaemon.");
+            informative_text = tr ("It is probably not running correctly or crashed in-between.");
+            break;
+        }
+        case QProcess::UnknownError: {
+        }
+        default: {
+            main_text += tr ("experienced an unknown error.");
+        }
     }
 
     if (!informative_text.isEmpty ()) {

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