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

[Christian Mollekopf]

 resources/kolab/kolabretrievecollectionstask.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 21f9a05dd67750508266e2cf95a0a0ef949f7a4e
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Mon Aug 11 17:26:14 2014 +0200

    We need to merge the collectionmetadata.

diff --git a/resources/kolab/kolabretrievecollectionstask.cpp b/resources/kolab/kolabretrievecollectionstask.cpp
index 915409b..cec9ebc 100644
--- a/resources/kolab/kolabretrievecollectionstask.cpp
+++ b/resources/kolab/kolabretrievecollectionstask.cpp
@@ -111,7 +111,10 @@ void RetrieveMetadataJob::onGetMetaDataDone( KJob *job )
     }
 
     KIMAP::GetMetaDataJob *meta = qobject_cast<KIMAP::GetMetaDataJob*>( job );
-    mMetadata = meta->allMetaDataForMailboxes();
+    const QHash<QString, QMap<QByteArray, QByteArray> > metadata = meta->allMetaDataForMailboxes();
+    Q_FOREACH (const QString &folder, metadata.keys()) {
+        mMetadata.insert(folder, metadata.value(folder));
+    }
     checkDone();
 }