This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 1f765cf54b67131dc583405494c8e19e4405bf36 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 27 11:57:19 2014 +0100 Revert "Fix placement of session folders in session card column." This reverts commit ec57aff173971c0176cef495d4ecd7e379da0bad. --- debian/changelog | 1 - onmainwindow.cpp | 13 ------------- onmainwindow_privat.h | 1 - 3 files changed, 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8fd126..8eab3fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,6 @@ x2goclient (4.0.3.1-0x2go1) UNRELEASED; urgency=medium - Split Sessions config widget into Input/output and Media widgets. (Fixes: #643). - Reformat onmainwindow.cpp - - Fix placement of session folders in session card column. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 21 Oct 2014 13:22:39 +0200 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index fa6c8f1..0c3bce8 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1272,19 +1272,6 @@ void ONMainWindow::slotResize ( const QSize sz ) } else { - QList<FolderButton*>::iterator fit; - QList<FolderButton*>::iterator fend=sessionExplorer->getFoldersList()->end(); - for ( fit=sessionExplorer->getFoldersList()->begin(); fit!=fend; fit++ ) - { - if ( !miniMode ) - ( *fit )->move ( - ( usize-360 ) /2, - ( *fit )->pos().y() ); - else - ( *fit )->move ( - ( usize-250 ) /2, - ( *fit )->pos().y() ); - } QList<SessionButton*>::iterator it; QList<SessionButton*>::iterator end=sessionExplorer->getSessionsList()->end(); for ( it=sessionExplorer->getSessionsList()->begin(); it!=end; it++ ) diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index d04de8a..037483f 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -137,7 +137,6 @@ #include "configdialog.h" #include "editconnectiondialog.h" #include "sessionbutton.h" -#include "folderbutton.h" #include "sessionexplorer.h" #include "sessionmanagedialog.h" #include "x2gologdebug.h" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git