[Pkg-owncloud-commits] [owncloud-client] 16/33: Account settings: Set correct state icon right away

[Sandro Knauß]

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

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

commit 5c1d6127614a999b3f27ac828ae09a660370ee47
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Feb 21 21:02:35 2014 +0100

    Account settings: Set correct state icon right away
---
 src/mirall/settingsdialog.cpp | 11 +++++++----
 src/mirall/settingsdialog.h   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/mirall/settingsdialog.cpp b/src/mirall/settingsdialog.cpp
index 7b69af5..8c5afb8 100644
--- a/src/mirall/settingsdialog.cpp
+++ b/src/mirall/settingsdialog.cpp
@@ -128,10 +128,11 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::addAccount(const QString &title, QWidget *widget)
 {
-    _accountItem = new QListWidgetItem(Theme::instance()->syncStateIcon(SyncResult::Undefined, true), title);
+    _accountItem = new QListWidgetItem(title);
     _accountItem->setSizeHint(QSize(0, 32));
     _ui->labelWidget->addItem(_accountItem);
     _ui->stack->addWidget(widget);
+    slotSyncStateChange();
 
 }
 
@@ -141,9 +142,11 @@ void SettingsDialog::slotSyncStateChange(const QString& alias)
     SyncResult state = folderMan->accountStatus(folderMan->map().values());
     _accountItem->setIcon(Theme::instance()->syncStateIcon(state.status()));
 
-    Folder *folder = folderMan->folder(alias);
-    if( folder ) {
-        _accountSettings->slotUpdateFolderState(folder);
+    if (!alias.isEmpty()) {
+        Folder *folder = folderMan->folder(alias);
+        if( folder ) {
+            _accountSettings->slotUpdateFolderState(folder);
+        }
     }
 }
 
diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h
index 8fbdd95..cd6d690 100644
--- a/src/mirall/settingsdialog.h
+++ b/src/mirall/settingsdialog.h
@@ -45,7 +45,7 @@ public:
     void setGeneralErrors( const QStringList& errors );
 
 public slots:
-    void slotSyncStateChange(const QString& alias);
+    void slotSyncStateChange(const QString& alias = QString());
     void slotRefreshResultList();
     void showActivityPage();
 

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