[X2Go-Commits] [x2goclient] 04/05: onmainwindow.cpp: use Non_Modal_MessageBox::critical function to display errors relating to missing sshd host keys.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 9 23:26:56 CET 2015


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

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

commit fd09a566f234f80574b1d037f68c9087f75293c7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Mar 9 22:53:56 2015 +0100

    onmainwindow.cpp: use Non_Modal_MessageBox::critical function to display errors relating to missing sshd host keys.
    
    Fixes #794.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |   26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 393f57e..3c1740e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -188,6 +188,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       keys. Fixes: #793.
     - non_modal_messagebox.{cpp,h}: Add new Non_Modal_MessageBox class for
       non-modal message boxes.
+    - onmainwindow.cpp: use Non_Modal_MessageBox::critical function to display
+      errors relating to missing sshd host keys. Fixes: #794.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 13:25:28 +0100
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 4eae095..07707b9 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -11392,17 +11392,21 @@ void ONMainWindow::printSshDError_noHostPubKey()
 {
     if ( closeEventSent )
         return;
-    QMessageBox::critical ( 0l,tr ( "SSH Error" ),
-                            tr ( "SSH daemon failed to open the its public host key.\n\n"
-
-                                 "You have enabled Remote Printing or File Sharing.\n"
-                                 "These features require a running and functioning SSH server on your computer.\n\n"
-                                 "The Server is currently not configured correctly.\n\n"
-                                 "Please ensure that the server's public exists.\n"
-                                 "Host keys can be generated by running:\n\n"
-                                 "\tsudo ssh-keygen -A"
-                               ),
-                            QMessageBox::Ok, QMessageBox::NoButton );
+    Non_Modal_MessageBox::critical (0l, tr ( "SSH Error" ),
+                                    tr ("SSH daemon failed to open its public host key.\n\n"
+
+                                        "You have enabled Remote Printing or File Sharing.\n"
+                                        "These features require a running and functioning SSH server on your computer.\n\n"
+
+                                        "The Server is currently not configured correctly.\n\n"
+
+                                        "Please ensure that the server's public exists.\n"
+                                        "Host keys can be generated by running:\n\n"
+
+                                        "\tsudo ssh-keygen -A\n\n"
+
+                                        "Disabling Remote Printing or File Sharing support will get rid of this message."),
+                                    QMessageBox::Ok, QMessageBox::NoButton);
 }
 
 void ONMainWindow::printSshDError_noExportPubKey()

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