This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c3fd1f3513f93ae35e5ff51e8726401ecd0c26c2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 22 23:51:20 2021 +0100 src/onmainwindow.cpp: consolidate Resume button enabling state in ONMainWindow::initSelectSessDlg (). --- debian/changelog | 2 ++ src/onmainwindow.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7a2b29..95ff248 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: add Cancel standard shortcut to cancel button in login window. Change requested by Max-Planck-Institut für Kolloid- und Grenzflächenforschung Potsdam. + - src/onmainwindow.cpp: consolidate Resume button enabling state in + ONMainWindow::initSelectSessDlg (). * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e2a5a56..817c1fc 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -12885,7 +12885,7 @@ void ONMainWindow::initSelectSessDlg() - sOk->setEnabled ( true ); + sOk->setEnabled (false); sCancel->setEnabled ( true ); selectSessionDlg->setEnabled ( true ); setEnabled ( true ); @@ -12943,7 +12943,6 @@ void ONMainWindow::initSelectSessDlg() bSusp->setPalette ( pal ); bTerm->setPalette ( pal ); sessTv->setFrameStyle ( QFrame::StyledPanel|QFrame::Plain ); - sOk->setEnabled ( false ); bSusp->setEnabled ( false ); bTerm->setEnabled ( false ); bShadow->setEnabled ( false ); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git