This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 3060183a78d8b6bd81bec9968c985c38bfd1e5c2 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 25 14:16:40 2018 +0100 src/onmainwindow.cpp: disable and enable close button during and after connection startup. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 62d5453..434d06e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: reformat, whitespace fixes, split out close button slot in a separate function. - src/onmainwindow.{cpp,h}: let close button be a member variable. + - src/onmainwindow.cpp: disable and enable close button during and after + connection startup. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e526c9f..28762c8 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -540,6 +540,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) { bClose->move (10,10); } + bClose->setEnabled (true); bClose->show (); connect (bClose, SIGNAL (clicked ()), this, SLOT (slotCloseButton ())); } @@ -3061,6 +3062,7 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession pass->setFocus(); pass->selectAll(); + bClose->setEnabled (true); passForm->setEnabled ( true ); } @@ -3292,6 +3294,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } slotSshUserAuthError ( tr ( "Host key verification failed." ) ); sshConnection=0; + bClose->setEnabled (true); return; } else @@ -3320,6 +3323,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } slotSshUserAuthError ( tr ( "Host key verification failed." ) ); sshConnection=0; + bClose->setEnabled (true); return; } else @@ -3339,6 +3343,7 @@ 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. " @@ -3363,6 +3368,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa } sshConnection=0; slotSshUserAuthError ( tr ( "Host key verification failed." ) ); + bClose->setEnabled (true); return; } connection->writeKnownHosts(true); @@ -3405,7 +3411,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) pass->setFocus(); pass->selectAll(); - + bClose->setEnabled (true); passForm->setEnabled ( true ); } @@ -3434,6 +3440,8 @@ void ONMainWindow::slotSessEnter() return; } + bClose->setEnabled (false); + resumingSession.sessionId=QString::null; resumingSession.server=QString::null; resumingSession.display=QString::null; @@ -5389,6 +5397,7 @@ void ONMainWindow::slotRetResumeSess ( bool result, message,QMessageBox::Ok, QMessageBox::NoButton ); slotShowPassForm(); + bClose->setEnabled (true); return; } @@ -5583,6 +5592,9 @@ 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