[X2Go-Commits] [x2goclient] 01/06: Be more exact when reporting rev forwarding tunnel request failures to the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) in the 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 master
in repository x2goclient.

commit e1597f9687736757d6784197fe2dc5e9b83a59a0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 8 09:22:30 2015 +0100

    Be more exact when reporting rev forwarding tunnel request failures to the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) in the error message.
---
 debian/changelog |    3 +++
 onmainwindow.cpp |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae08442..d980d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
       session. This fixes X2Go Client crashes that occur when printing via
       the CUPS-X2Go printing mechanism with activate print dialog popup on
       incoming print jobs and minimized main window. (Fixes: #702).
+    - Be more exact when reporting rev forwarding tunnel request failures to
+      the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing)
+      in the error message.
 
   [ Jason Alavaliant ]
   * New upstream verson (4.0.3.2):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 71d51bf..1064680 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5362,7 +5362,7 @@ void ONMainWindow::slotTunnelFailed ( bool result,  QString output,
     {
         if ( !managedMode )
         {
-            QString message=tr ( "Unable to create SSL tunnel:\n" )
+            QString message=tr ( "Unable to create SSH tunnel for X2Go session (NX) startup:\n" )
                             +output;
             QMessageBox::critical ( 0l,tr ( "Error" ),message,
                                     QMessageBox::Ok,
@@ -5392,7 +5392,7 @@ void ONMainWindow::slotSndTunnelFailed ( bool result,  QString output,
     {
         if ( !managedMode )
         {
-            QString message=tr ( "Unable to create SSL Tunnel:\n" )
+            QString message=tr ( "Unable to create SSH Tunnel for audio data:\n" )
                             +output;
             QMessageBox::warning ( 0l,tr ( "Warning" ),message,
                                    QMessageBox::Ok,
@@ -9014,7 +9014,7 @@ void ONMainWindow::slotFsTunnelFailed ( bool result,  QString output,
         if ( !managedMode )
         {
 
-            QString message=tr ( "Unable to create SSL tunnel:\n" )
+            QString message=tr ( "Unable to create SSH tunnel for foldersharing and printing:\n" )
                             +output;
             QMessageBox::critical ( 0l,tr ( "Error" ),message,
                                     QMessageBox::Ok,

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