Branch 'kolab/integration/4.13.0' - 2 commits - plugins/akonadi_serializer_mail.cpp resources/kolab

Christian Mollekopf mollekopf at kolabsys.com
Mon Jan 5 23:03:18 CET 2015


 plugins/akonadi_serializer_mail.cpp    |    5 ++++-
 resources/kolab/kolabchangetagtask.cpp |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9c6cc2cb1e1710aa03b29baad7ee483e22b72d38
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Mon Jan 5 23:01:25 2015 +0100

    We need the full payload when creating the member.

diff --git a/resources/kolab/kolabchangetagtask.cpp b/resources/kolab/kolabchangetagtask.cpp
index 64c9068..71bd221 100644
--- a/resources/kolab/kolabchangetagtask.cpp
+++ b/resources/kolab/kolabchangetagtask.cpp
@@ -41,6 +41,7 @@ void KolabChangeTagTask::startRelationTask(KIMAP::Session *session)
     fetch->fetchScope().setCacheOnly(true);
     // TODO: does the fetch already limit to resource local items?
     fetch->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::All);
+    fetch->fetchScope().fetchFullPayload(true);
     connect(fetch, SIGNAL(result(KJob*)), this, SLOT(onItemsFetchDone(KJob*)));
 }
 


commit 4637f60dd6cce528f9eb4ad181f3f1a874a2aa69
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Mon Jan 5 21:21:34 2015 +0100

    Extract the GID from notes as well.
    
    Since we reuse the serializer.

diff --git a/plugins/akonadi_serializer_mail.cpp b/plugins/akonadi_serializer_mail.cpp
index a6ac4b8..4dd76c2 100644
--- a/plugins/akonadi_serializer_mail.cpp
+++ b/plugins/akonadi_serializer_mail.cpp
@@ -226,8 +226,11 @@ QString SerializerPluginMail::extractGid(const Item& item) const
     return QString();
   const KMime::Message::Ptr msg = item.payload<KMime::Message::Ptr>();
   KMime::Headers::MessageID *mid = msg->messageID( false );
-  if (mid)
+  if (mid) {
     return mid->asUnicodeString();
+  } else if (KMime::Headers::Base *uid = msg->headerByType("X-Akonotes-UID")) {
+    return uid->asUnicodeString();
+  }
   return QString();
 }
 




More information about the commits mailing list