[X2Go-Commits] [x2goclient] 01/04: Revert "src/onmainwindow.cpp: disable and enable close button during and after connection startup."

[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 dbe5632c73a952f8c082c44ae28b3f453bae8650
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 14 20:37:45 2018 +0100

    Revert "src/onmainwindow.cpp: disable and enable close button during and after connection startup."
    
    This reverts commit 3060183a78d8b6bd81bec9968c985c38bfd1e5c2.
    
    Being able to suspend sessions via the close button is complex and
    unnecessary, since in thinclient mode, for which this feature is useful,
    users will not be able to see the client window while a session is
    executing, due to it running in full screen mode.
---
 debian/changelog     |  5 +++++
 src/onmainwindow.cpp | 13 +------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 837e082..606b075 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,11 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
       Linux. Fixes compile failures on Windows and OS X.
     - src/onmainwindow.cpp: always create close button, but either hide or
       show it based upon whether --closebt was provided or not.
+    - src/onmainwindow.cpp: revert 3060183a78d8b6bd81bec9968c985c38bfd1e5c2.
+      Being able to suspend sessions via the close button is complex and
+      unnecessary, since in thinclient mode, for which this feature is
+      useful, users will not be able to see the client window while a session
+      is executing, due to it running in full screen mode.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.1.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 97d9602..4b75501 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3075,7 +3075,6 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession
         pass->setFocus();
         pass->selectAll();
 
-        bClose->setEnabled (true);
 
         passForm->setEnabled ( true );
     }
@@ -3307,7 +3306,6 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
             }
             slotSshUserAuthError ( tr ( "Host key verification failed." ) );
             sshConnection=0;
-            bClose->setEnabled (true);
             return;
         }
         else
@@ -3336,7 +3334,6 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
             }
             slotSshUserAuthError ( tr ( "Host key verification failed." ) );
             sshConnection=0;
-            bClose->setEnabled (true);
             return;
         }
         else
@@ -3356,7 +3353,6 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
         }
         sshConnection=0;
         slotSshUserAuthError ( sshMessage );
-        bClose->setEnabled (true);
         return ;
     case SSH_SERVER_FILE_NOT_FOUND:
         errMsg=tr ( "Could not find known hosts file. "
@@ -3381,7 +3377,6 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
         }
         sshConnection=0;
         slotSshUserAuthError ( tr ( "Host key verification failed." ) );
-        bClose->setEnabled (true);
         return;
     }
     connection->writeKnownHosts(true);
@@ -3424,7 +3419,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error )
     pass->setFocus();
     pass->selectAll();
 
-    bClose->setEnabled (true);
+
 
     passForm->setEnabled ( true );
 }
@@ -3453,8 +3448,6 @@ void ONMainWindow::slotSessEnter()
         return;
     }
 
-    bClose->setEnabled (false);
-
     resumingSession.sessionId=QString::null;
     resumingSession.server=QString::null;
     resumingSession.display=QString::null;
@@ -5410,7 +5403,6 @@ void ONMainWindow::slotRetResumeSess ( bool result,
                                 message,QMessageBox::Ok,
                                 QMessageBox::NoButton );
         slotShowPassForm();
-        bClose->setEnabled (true);
         return;
     }
 
@@ -5605,9 +5597,6 @@ void ONMainWindow::slotRetResumeSess ( bool result,
         }
 
     }
-
-    bClose->setEnabled (true);
-
     if ( !useLdap )
     {
         if ( brokerMode )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git