This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7b3bca1fa9eb346f280853a9b98880032d89505b Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 25 14:14:22 2018 +0100 src/onmainwindow.{cpp,h}: let close button be a member variable. --- debian/changelog | 1 + src/onmainwindow.cpp | 5 ++++- src/onmainwindow.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3c65dd0..62d5453 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium it's editable. Fixes: #1214. - {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. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 69ce587..e526c9f 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -197,6 +197,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) gpgAgent=0l; statusLabel=0; gpg=0l; + bClose = NULL; restartResume=false; isPassShown=true; readExportsFrom=QString::null; @@ -526,7 +527,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) if (showCloseBtn) { - QPushButton *bClose = new QPushButton (bgFrame); + bClose = new QPushButton (bgFrame); QPixmap p (":/img/png/close-button.png"); bClose->setIcon (p); bClose->setFocusPolicy (Qt::NoFocus); @@ -1646,6 +1647,8 @@ void ONMainWindow::closeClient() x2goDebug << "libssh finalized."; } + delete (bClose); + x2goInfof(7)<<tr("Finished X2Go Client closing hooks."); } diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 6585fe1..e857a1c 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -684,6 +684,9 @@ private: QPushButton* bCancel; + QPushButton *bClose; + + QLabel* selectSessionLabel; SessTreeView* sessTv; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git