The branch, master has been updated via 162833f0bfd59c2817020fed998d86f0880ee9cb (commit) via 0727f52a32e658d47ab714afd4b58bdc381b20e4 (commit) from f43fbaae0f087fb73a7afcd49037ac21a9c9f8c1 (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 162833f0bfd59c2817020fed998d86f0880ee9cb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Feb 23 23:40:49 2013 +0100 Fix position shifts of broker login widget on repetetive authentication failures. (Fixes: #71). commit 0727f52a32e658d47ab714afd4b58bdc381b20e4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Feb 13 14:37:32 2013 +0100 work in changelog entry for release 4.0.0.3 Conflicts: debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 14 +++++++++++--- onmainwindow.cpp | 3 --- 2 files changed, 11 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b4acd4b..53dee5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,14 +4,22 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.1.0): - Add French translation file. - [ Mike Gabriel ] - * Continue new feature development... - [ Oleksandr Shneyder ] * Launching parec to init pulseaudio input only on Windows + [ Mike Gabriel ] + * New upstream version (4.0.1.0): + - Fix position shifts of broker login widget on repetetive authentication + failures. (Fixes: #71). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 +x2goclient (4.0.0.3-0~x2go1) unstable; urgency=low + + * Fix version in version.h, VERSION and x2goplugin.rc. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 13 Feb 2013 14:37:24 +0100 + x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/onmainwindow.cpp b/onmainwindow.cpp index acef85f..978357a 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -959,9 +959,6 @@ void ONMainWindow::slotGetBrokerAuth() Qt::SmoothTransformation ) ); fotoLabel->setFixedSize ( 48,48 ); } - users->hide(); - ln->hide(); - bgLay->insertStretch(3); QString text=tr("<b>Authentication</b>"); /* if(config.brokerName.length()>0) text+=config.brokerName; 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).