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

Christian Mollekopf mollekopf at kolabsys.com
Fri Jan 30 17:33:26 CET 2015


 resources/kolab/kolabhelpers.cpp          |    6 +++++-
 resources/kolab/kolabretrievetagstask.cpp |    3 +++
 resources/kolab/tagchangehelper.cpp       |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 36d046385596c3298357795ef063177b6d4a00b6
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jan 30 17:33:22 2015 +0100

    Trace debut output

diff --git a/resources/kolab/kolabretrievetagstask.cpp b/resources/kolab/kolabretrievetagstask.cpp
index 081232d..cae3c77 100644
--- a/resources/kolab/kolabretrievetagstask.cpp
+++ b/resources/kolab/kolabretrievetagstask.cpp
@@ -25,6 +25,7 @@
 #include <kimap/fetchjob.h>
 #include <imapflags.h>
 #include <kolabobject.h>
+#include "tracer.h"
 
 KolabRetrieveTagTask::KolabRetrieveTagTask(ResourceStateInterface::Ptr resource, RetrieveType type, QObject *parent)
     : KolabRelationResourceTask(resource, parent)
@@ -158,6 +159,8 @@ void KolabRetrieveTagTask::extractTag(const Kolab::KolabObjectReader &reader, qi
     tag.setRemoteId(QByteArray::number(remoteUid));
     mTags << tag;
 
+    Trace() << "Extracted tag: " << tag.gid() << " remoteId: " << remoteUid << tag.remoteId();
+
     Akonadi::Item::List members;
     Q_FOREACH (const QString &memberUrl, reader.getTagMembers()) {
         Kolab::RelationMember member = Kolab::parseMemberUrl(memberUrl);


commit ace6a1d0f56f08c0be97b5ece6c472fc5066ef3c
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jan 30 17:33:02 2015 +0100

    Kolab-Resource: Fix tag updates.
    
    Cast to the correct job and hopefully avoid updating to a bogus
    remoteId.

diff --git a/resources/kolab/tagchangehelper.cpp b/resources/kolab/tagchangehelper.cpp
index a1d6dd4..169aaef 100644
--- a/resources/kolab/tagchangehelper.cpp
+++ b/resources/kolab/tagchangehelper.cpp
@@ -106,7 +106,7 @@ void TagChangeHelper::onReplaceDone(KJob *job)
     if (job->error()) {
         kWarning() << "Replace failed: " << job->errorString();
     }
-    ReplaceMessageJob *replaceJob = static_cast<ReplaceMessageJob*>(job);
+    UpdateMessageJob *replaceJob = static_cast<UpdateMessageJob*>(job);
     const qint64 newUid = replaceJob->newUid();
     const Akonadi::Tag tag = job->property("tag").value<Akonadi::Tag>();
     if (newUid > 0) {


commit e367dce6d94486a4d3eed52cc1d16620445c9892
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Fri Jan 30 13:02:32 2015 +0100

    Kolab-Resource: Don't set all calendar mimetypes on calendar folders.
    
    Instead only set todo/event/journal.

diff --git a/resources/kolab/kolabhelpers.cpp b/resources/kolab/kolabhelpers.cpp
index 0c69c75..6951059 100644
--- a/resources/kolab/kolabhelpers.cpp
+++ b/resources/kolab/kolabhelpers.cpp
@@ -386,9 +386,13 @@ QStringList KolabHelpers::getContentMimeTypes(Kolab::FolderType type)
     contentTypes << Akonadi::Collection::mimeType();
     switch (type) {
         case Kolab::EventType:
+            contentTypes <<  KCalCore::Event().mimeType();
+            break;
         case Kolab::TaskType:
+            contentTypes <<  KCalCore::Todo().mimeType();
+            break;
         case Kolab::JournalType:
-            contentTypes <<  KCalCore::Incidence::mimeTypes();
+            contentTypes <<  KCalCore::Journal().mimeType();
             break;
         case Kolab::ContactType:
             contentTypes << KABC::Addressee::mimeType() << KABC::ContactGroup::mimeType();




More information about the commits mailing list