[X2Go-Commits] [x2goclient] 11/12: onmainwindow.cpp: don't let a potential terminal affect the help string shown in the GUI.

[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 dc2c70c147f84ce47e2e709a5f40bc24c7d666e7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Apr 24 01:10:34 2015 +0200

    onmainwindow.cpp: don't let a potential terminal affect the help string shown in the GUI.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e7a6516..bd28f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -310,6 +310,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - help.{cpp,h}: add a boolean terminal_output parameter to the
       pretty_print() function family. Controls terminal width auto-detection
       and automatic printing to stderr.
+    - onmainwindow.cpp: don't let a potential terminal affect the help string
+      shown in the GUI.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 2230cd6..080ea03 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -7184,7 +7184,7 @@ void ONMainWindow::showHelp ()
     if (!startHidden && !haveTerminal) {
         HelpDialog dlg (this);
         dlg.setWindowTitle (tr ("Help"));
-        dlg.setText (out);
+        dlg.setText (help::pretty_print (false));
         dlg.exec ();
     }
 }

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