This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 4463a0a src/onmainwindow.cpp: always create close button, but either hide or show it based upon whether --closebt was provided or not. new dbe5632 Revert "src/onmainwindow.cpp: disable and enable close button during and after connection startup." new c57ad5d src/onmainwindow.cpp: always enable close button, let it log out from a broker if already authenticated or close the client on click. Fixes: #1209. new 812f5b0 man/man1/x2goclient.1: clarify what the close button now does. new 49d8862 src/onmainwindow.cpp: correctly initialize brokerAuthentication member of ConfigFile struct. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 12 ++++++++++++ man/man1/x2goclient.1 | 4 ++-- src/onmainwindow.cpp | 27 ++++++++++++--------------- 3 files changed, 26 insertions(+), 17 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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@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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c57ad5d8cd641f789a26278e3d3f112e9db5874e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 14 22:25:09 2018 +0100 src/onmainwindow.cpp: always enable close button, let it log out from a broker if already authenticated or close the client on click. Fixes: #1209. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 606b075..09e563e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,9 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium 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. + - src/onmainwindow.cpp: always enable close button, let it log out from a + broker if already authenticated or close the client on click. Fixes: + #1209. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 4b75501..34fd4eb 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -612,10 +612,17 @@ void ONMainWindow::slotShutdownThinClient() void ONMainWindow::slotCloseButton () { /* - * Needs a lot more logic here to suspend a session if one - * is running and log out of the broker. + * Log out of the broker if currently logged in, otherwise + * close the client. */ - close (); + if (config.brokerAuthenticated) { + x2goDebug << "Logging off from broker via close button."; + QTimer::singleShot (1, this, SLOT (slotGetBrokerAuth ())); + } + else { + x2goDebug << "Closing client via close button."; + close (); + } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 812f5b09facfbfc520c50cd0a4c84056beb32844 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 14 22:36:45 2018 +0100 man/man1/x2goclient.1: clarify what the close button now does. It either lets the user re-login to the broker or closes the client. --- debian/changelog | 2 ++ man/man1/x2goclient.1 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09e563e..6949544 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: always enable close button, let it log out from a broker if already authenticated or close the client on click. Fixes: #1209. + - man/man1/x2goclient.1: clarify what the close button now does. It either + lets the user re-login to the broker or closes the client. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index 36eec15..d0dd806 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -193,8 +193,8 @@ Show a "Shutdown" button in the top left corner of X2Go Client. When pressed, X2 $HOME/.halt. An external script has to watch for this file and trigger a thinclient shutdown once it appears. .TP \*(T<\fB\-\-closebt\fR\*(T> -Show a "Close" button in the top left corner of X2Go Client when logged in broker/thinclient mode. -When pressed, X2Go Client will be closed and automatically restarted if in thinclient mode. +Show a "Close" button in the top left corner of X2Go Client. When logged in to a broker, pressing this button +X2Go Client lets you login to the broker again. Otherwise, X2Go Client will be closed. .SH PORTABLE OPTIONS X2Go Client can be installed on a USB-Flashdrive as a portable applications. If installed that way, the following -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 49d88623b3d33baed6f4edd83243bc4b9ecd9ab2 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 14 22:52:14 2018 +0100 src/onmainwindow.cpp: correctly initialize brokerAuthentication member of ConfigFile struct. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6949544..9e7c201 100644 --- a/debian/changelog +++ b/debian/changelog @@ -77,6 +77,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium #1209. - man/man1/x2goclient.1: clarify what the close button now does. It either lets the user re-login to the broker or closes the client. + - src/onmainwindow.cpp: correctly initialize brokerAuthentication member + of ConfigFile struct. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 34fd4eb..0caa920 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -133,6 +133,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) config.brokerAutologin=false; config.brokerKrbLogin=false; config.brokerAutologoff=false; + config.brokerAuthenticated = false; config.published=false; cmdAutologin=false; #if defined (Q_OS_DARWIN) || defined (Q_OS_WIN) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org