Branch 'kolab/integration/4.13.0' - resources/kolab

Aaron Seigo seigo at kolabsys.com
Wed Nov 19 21:27:27 CET 2014


 resources/kolab/kolabretrievetagstask.cpp |    8 ++++++--
 resources/kolab/kolabretrievetagstask.h   |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5c4a9083eab453f93101944d29d1f85e197c7aea
Author: Aaron Seigo <aseigo at kde.org>
Date:   Wed Nov 19 21:24:44 2014 +0100

    do not call tagsReceieved unconditionally: check what we are fetching first
    
    consolidates that code in a taskComplete() method to avoid code dupe
    and similar future fubars

diff --git a/resources/kolab/kolabretrievetagstask.cpp b/resources/kolab/kolabretrievetagstask.cpp
index 5aa07a2..3330c4d 100644
--- a/resources/kolab/kolabretrievetagstask.cpp
+++ b/resources/kolab/kolabretrievetagstask.cpp
@@ -56,8 +56,7 @@ void KolabRetrieveTagTask::onFinalSelectDone(KJob *job)
     KIMAP::FetchJob *fetch = new KIMAP::FetchJob(select->session());
 
     if (select->messageCount() == 0) {
-        resourceState()->tagsRetrieved(mTags, mTagMembers);
-        deleteLater();
+        taskComplete();
         return;
     }
 
@@ -203,6 +202,11 @@ void KolabRetrieveTagTask::onHeadersFetchDone(KJob *job)
         return;
     }
 
+    taskComplete();
+}
+
+void KolabRetrieveTagTask::taskComplete()
+{
     if (mRetrieveType == RetrieveTags) {
         kDebug() << "Fetched tags: " << mTags.size() << mTagMembers.keys().size();
         resourceState()->tagsRetrieved(mTags, mTagMembers);
diff --git a/resources/kolab/kolabretrievetagstask.h b/resources/kolab/kolabretrievetagstask.h
index eb63743..a7514d3 100644
--- a/resources/kolab/kolabretrievetagstask.h
+++ b/resources/kolab/kolabretrievetagstask.h
@@ -64,6 +64,7 @@ private:
     void extractTag(const Kolab::KolabObjectReader &reader, qint64 remoteUid);
     void extractRelation(const Kolab::KolabObjectReader &reader, qint64 remoteUid);
     Akonadi::Item extractMember(const Kolab::RelationMember &member);
+    void taskComplete();
 };
 
 #endif // KOLABCHANGETAGTASK_H




More information about the commits mailing list