[Pkg-owncloud-commits] [owncloud-client] 405/484: Settings: Fix "Choose what to sync" #4187

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 2982c794442995ad5a09a6d06fbdf880652c90e2
Author: Christian Kamm <mail at ckamm.de>
Date:   Tue Nov 24 13:41:00 2015 +0100

    Settings: Fix "Choose what to sync" #4187
    
    There was a duplicate connect() due to a merge problem (?) in
    7e4c0bd5158001dca7d5d7c6c34c7dea21911125
---
 src/gui/accountsettings.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 3abb78b..f6a96b2 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -109,6 +109,8 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :
     connect(syncNowAction, SIGNAL(triggered()), SLOT(slotSyncCurrentFolderNow()));
     addAction(syncNowAction);
 
+    // Expand already on single click
+    ui->_folderList->setExpandsOnDoubleClick(false);
     connect(ui->_folderList, SIGNAL(clicked(const QModelIndex &)),
             this, SLOT(slotFolderListClicked(const QModelIndex&)));
 
@@ -150,11 +152,6 @@ void AccountSettings::createAccountToolbox()
     ui->_accountToolbox->setText(tr("Account") + QLatin1Char(' '));
     ui->_accountToolbox->setMenu(menu);
     ui->_accountToolbox->setPopupMode(QToolButton::InstantPopup);
-
-    // Expand already on single click
-    ui->_folderList->setExpandsOnDoubleClick(false);
-    QObject::connect(ui->_folderList, SIGNAL(clicked(const QModelIndex &)),
-                     this, SLOT(slotFolderListClicked(const QModelIndex&)));
 }
 
 void AccountSettings::slotOpenAccountWizard()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git