[Pkg-owncloud-commits] [owncloud-client] 348/484: ActivityWidget: Always combine the final activity list.

[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 1cdf0e85972ca5ab82942dd28141e62ab44d7a66
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Nov 17 14:44:48 2015 +0100

    ActivityWidget: Always combine the final activity list.
    
    In cases where the activity app is not activated on the server, the
    returned list of activities is empty, so it is better this way.
---
 src/gui/activitywidget.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 4601613..03ab131 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -151,6 +151,7 @@ void ActivityListModel::startFetchJob(AccountState* s)
     job->addQueryParams(params);
 
     _currentlyFetching.insert(s);
+    qDebug() << "Start fetching activities for " << s->account()->displayName();
     job->start();
 }
 
@@ -179,20 +180,7 @@ void ActivityListModel::slotActivitiesReceived(const QVariantMap& json)
 
     _activityLists[ai] = list;
 
-    // if all activity lists were received, assemble the whole list
-    // otherwise wait until the others are finished
-    bool allAreHere = true;
-    foreach( ActivityList list, _activityLists.values() ) {
-        if( list.count() == 0 ) {
-            allAreHere = false;
-            break;
-        }
-    }
-
-    // FIXME: Be more efficient,
-    if( allAreHere ) {
-        combineActivityLists();
-    }
+    combineActivityLists();
 }
 
 

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