This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7fec3e5cadcb4d8a366c1dd7707774bf1bb4159c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jun 30 13:27:51 2014 +0200 more fixes for a3f54345646ce35eea731eeedec1550f6551f606 --- onmainwindow.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/onmainwindow.cpp b/onmainwindow.cpp index ca4ae45..835c835 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -120,9 +120,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) /* Initialize at least these variables before they get filled via loadSettings() * They have to be initialized as they are used in closeEvent() and closeClient()... */ - trayIcon=false; + trayIcon=NULL; useLdap=false; - trayNoClose=false; + trayNoclose=false; appSeparator=0; config.brokerNoAuth=false; @@ -262,7 +262,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) loadSettings(); trayIconActiveConnectionMenu = NULL; - trayIcon = NULL; trayIconMenu=NULL; trayAutoHidden=false; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git