[Pkg-owncloud-commits] [owncloud-client] 246/498: Folders: Show as disconnected when account is disconnected.

[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 ae69ff032b4d7a9faba5ba63e1eea66820dd23e7
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Fri Jul 3 15:03:18 2015 +0200

    Folders: Show as disconnected when account is disconnected.
    
    Previously you could get a green folder icon even when the account
    was signed out or disconnected for another reason.
---
 src/gui/accountsettings.cpp   |  2 +-
 src/gui/folderstatusmodel.cpp | 12 ++++++------
 src/gui/folderstatusmodel.h   |  4 ++--
 src/libsync/accountfwd.h      |  2 ++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 41238bc..162abfb 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -68,7 +68,7 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :
     ui->setupUi(this);
 
     _model = new FolderStatusModel;
-    _model->setAccount(_accountState->account());
+    _model->setAccountState(_accountState);
     _model->setParent(this);
     FolderStatusDelegate *delegate = new FolderStatusDelegate;
     delegate->setParent(this);
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 9344c8ca..bbe75b0 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -37,16 +37,16 @@ FolderStatusModel::~FolderStatusModel()
 { }
 
 
-void FolderStatusModel::setAccount(const AccountPtr& account)
+void FolderStatusModel::setAccountState(const AccountState* accountState)
 {
     beginResetModel();
     _dirty = false;
     _folders.clear();
-    _account = account;
+    _accountState = accountState;
 
     auto folders = FolderMan::instance()->map();
     foreach (auto f, folders) {
-        if (f->accountState()->account() != account)
+        if (f->accountState() != accountState)
             continue;
         SubFolderInfo info;
         info._pathIdx << _folders.size();
@@ -121,7 +121,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
         return QVariant();
 
     const SubFolderInfo::Progress & progress = folderInfo._progress;
-    bool accountConnected = true; // FIXME
+    const bool accountConnected = _accountState->isConnected();
 
     switch (role) {
     case FolderStatusDelegate::FolderPathRole         : return  f->nativePath();
@@ -373,7 +373,7 @@ void FolderStatusModel::fetchMore(const QModelIndex& parent)
         }
         path += info->_path;
     }
-    LsColJob *job = new LsColJob(_account, path, this);
+    LsColJob *job = new LsColJob(_accountState->account(), path, this);
     job->setProperties(QList<QByteArray>() << "resourcetype" << "quota-used-bytes");
     job->setTimeout(5 * 1000);
     connect(job, SIGNAL(directoryListingSubfolders(QStringList)),
@@ -721,7 +721,7 @@ void FolderStatusModel::slotFolderSyncStateChange()
 
 void FolderStatusModel::resetFolders()
 {
-    setAccount(_account);
+    setAccountState(_accountState);
 }
 
 } // namespace OCC
diff --git a/src/gui/folderstatusmodel.h b/src/gui/folderstatusmodel.h
index 9fd4b60..d1b9c7d 100644
--- a/src/gui/folderstatusmodel.h
+++ b/src/gui/folderstatusmodel.h
@@ -36,7 +36,7 @@ class FolderStatusModel : public QAbstractItemModel
 public:
     FolderStatusModel(QObject * parent = 0);
     ~FolderStatusModel();
-    void setAccount(const OCC::AccountPtr& account);
+    void setAccountState(const AccountState* accountState);
 
     Qt::ItemFlags flags( const QModelIndex& ) const Q_DECL_OVERRIDE;
     QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
@@ -100,7 +100,7 @@ private slots:
 private:
     QStringList createBlackList(OCC::FolderStatusModel::SubFolderInfo* root,
                                 const QStringList& oldBlackList) const;
-    AccountPtr _account;
+    const AccountState* _accountState;
     bool _dirty;  // If the selective sync checkboxes were changed
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
diff --git a/src/libsync/accountfwd.h b/src/libsync/accountfwd.h
index c6915f3..28109f8 100644
--- a/src/libsync/accountfwd.h
+++ b/src/libsync/accountfwd.h
@@ -20,6 +20,8 @@ namespace OCC {
 
 class Account;
 typedef QSharedPointer<Account> AccountPtr;
+class AccountState;
+typedef QSharedPointer<AccountState> AccountStatePtr;
 
 } // namespace OCC
 

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