This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/general in repository x2goclient. commit 52040031502662dfff00f4b0fbbccebf66367f6a Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Mar 21 04:21:39 2015 +0100 onmainwindow.cpp: do not define Ctrl+Q two times. Made it unusable on Linux and Windows. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f14053e..ff72971 100644 --- a/debian/changelog +++ b/debian/changelog @@ -239,6 +239,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low sshd possibilities. - configdialog.cpp: make XQuartz detection algorithm QStringList-based and add MacPorts location. + - onmainwindow.cpp: do not define Ctrl+Q two times. Made it unusable on + Linux and Windows. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index e8c0026..9a2dc19 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -859,10 +859,6 @@ void ONMainWindow::initWidgetsNormal() stb=addToolBar ( tr ( "Show toolbar" ) ); - QShortcut* ex=new QShortcut ( QKeySequence ( tr ( "Ctrl+Q","exit" ) ), - this ); - connect ( ex,SIGNAL ( activated() ),this,SLOT ( close() ) ); - if ( drawMenu ) { QMenu* menu_sess=menuBar()->addMenu ( tr ( "&Session" ) ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git