The branch, master has been updated via 4c8f2512a0b38389ee8d290180fc146e33fa7ccc (commit) via 127e65ad7bc0ba4f0166a03b005cb37ec3df0380 (commit) from d8928beb7462b6fd7d8b0964be232d6258b2ec74 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4c8f2512a0b38389ee8d290180fc146e33fa7ccc Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Dec 12 14:45:36 2012 +0100 x2goclient will be closed if broker have no sessions and client should be minimized to tray commit 127e65ad7bc0ba4f0166a03b005cb37ec3df0380 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Dec 12 14:09:35 2012 +0100 init config.brokerAutologin with false ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ onmainwindow.cpp | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0366f5c..9a8d2e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,9 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low - Add support for pgp cards in broker mode. - Fix displaying ssh proxy box in session settings if sessions type changed. (Closes upstream issue: #61). + - init config.brokerAutologin with false + - x2goclient will be closed if broker have no sessions and client + should be minimized to tray [ Ricardo Diaz ] * New upstream version (3.99.3.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 4f8f95a..842afc5 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -105,6 +105,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) resumeAfterSuspending=false; appSeparator=0; + config.brokerNoAuth=false; #ifdef Q_OS_WIN @@ -969,6 +970,7 @@ void ONMainWindow::slotGetBrokerAuth() nameLabel->setText ( text ); slotShowPassForm(); config.brokerAuthenticated=false; + if(config.brokerUser.length()>0) { login->setText(config.brokerUser); @@ -1406,7 +1408,7 @@ void ONMainWindow::closeClient() void ONMainWindow::closeEvent ( QCloseEvent* event ) { x2goDebug<<"close event"; - if (trayNoclose) + if (trayNoclose && !brokerMode) { hide(); event->ignore(); @@ -2133,6 +2135,7 @@ void ONMainWindow::slotReadSessions() { QMessageBox::critical(this,tr("Error"),tr("X2Go sessions not found")); close(); + return; } for ( int i=0; i<slst.size(); ++i ) { @@ -9678,6 +9681,7 @@ void ONMainWindow::processSessionConfig() bool haveKey=false; config.command="KDE"; + config.brokerNoAuth=false; config.sshport="22"; config.session=tr ( "X2Go Session" ); config.checkexitstatus=true; hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).