Branch 'kolab/integration/4.13.0' - 2 commits - korganizer/akonadicollectionview.cpp korganizer/korganizerui.rc korganizer/views

[Christian Mollekopf]

 korganizer/akonadicollectionview.cpp           |    1 +
 korganizer/korganizerui.rc                     |    1 +
 korganizer/views/collectionview/controller.cpp |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2658784c8e788eda5a2c8cec7ad93cc257167bc0
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Aug 12 12:38:56 2014 +0200

    Enabled synchronize collection tree action.

diff --git a/korganizer/akonadicollectionview.cpp b/korganizer/akonadicollectionview.cpp
index 4471cfa..c2e0220 100644
--- a/korganizer/akonadicollectionview.cpp
+++ b/korganizer/akonadicollectionview.cpp
@@ -519,6 +519,7 @@ AkonadiCollectionView::AkonadiCollectionView( CalendarView *view, bool hasContex
                     << Akonadi::StandardActionManager::DeleteResources
                     << Akonadi::StandardActionManager::ResourceProperties
                     << Akonadi::StandardActionManager::SynchronizeResources
+                    << Akonadi::StandardActionManager::SynchronizeCollectionTree
                     << Akonadi::StandardActionManager::SynchronizeCollectionsRecursive;
 
     Q_FOREACH( Akonadi::StandardActionManager::Type standardAction, standardActions ) {
diff --git a/korganizer/korganizerui.rc b/korganizer/korganizerui.rc
index e5545b1..5772d4e 100644
--- a/korganizer/korganizerui.rc
+++ b/korganizer/korganizerui.rc
@@ -183,6 +183,7 @@
     <Action name="akonadi_resource_create"/>
     <Action name="akonadi_resource_delete"/>
     <Action name="akonadi_collection_sync"/>
+    <Action name="akonadi_resource_synchronize_collectiontree"/>
     <Separator/>
     <Action name="akonadi_collection_properties"/>
     <Action name="akonadi_resource_properties"/>


commit 868d781e37e7b14406b6b1a62c3e04ebb5d8c34c
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Aug 12 00:14:05 2014 +0200

    CollectionView: fixed referencing of person folders.

diff --git a/korganizer/views/collectionview/controller.cpp b/korganizer/views/collectionview/controller.cpp
index cea7f2c..83fac64 100644
--- a/korganizer/views/collectionview/controller.cpp
+++ b/korganizer/views/collectionview/controller.cpp
@@ -408,10 +408,10 @@ void Controller::onPersonEnabled(bool enabled, const Person& person)
         Akonadi::Collection rootCollection(person.rootCollection);
         if (rootCollection.isValid()) {
             //Reference the persons collections if available
+            //We have to include all mimetypes since mimetypes are not available yet (they will be synced once the collectoins are referenced)
             Akonadi::CollectionFetchJob *fetchJob = new Akonadi::CollectionFetchJob(rootCollection, Akonadi::CollectionFetchJob::Recursive, this);
             fetchJob->setProperty("enable", enabled);
             fetchJob->fetchScope().setListFilter(Akonadi::CollectionFetchScope::NoFilter);
-            fetchJob->fetchScope().setContentMimeTypes(QStringList() << QLatin1String("text/calendar"));
             connect(fetchJob, SIGNAL(result(KJob*)), this, SLOT(onPersonCollectionsFetched(KJob*)));
         }
     } else {