Branch 'kolab/integration/4.13.0' - korganizer/akonadicollectionview.cpp

[Christian Mollekopf]

 korganizer/akonadicollectionview.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 64bbde9676b2e7e6e2861e9733dea8e19f30a5ad
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Tue Aug 12 23:10:34 2014 +0200

    Workaround to filter Other Users.

diff --git a/korganizer/akonadicollectionview.cpp b/korganizer/akonadicollectionview.cpp
index c2e0220..b7994db 100644
--- a/korganizer/akonadicollectionview.cpp
+++ b/korganizer/akonadicollectionview.cpp
@@ -375,7 +375,8 @@ class CollectionFilter : public QSortFilterProxyModel
         const Akonadi::Collection &col = sourceIndex.data(Akonadi::EntityTreeModel::CollectionRole).value<Akonadi::Collection>();
         CollectionIdentificationAttribute *attr = col.attribute<CollectionIdentificationAttribute>();
         //We filter the user folders because we insert person nodes for user folders.
-        if (attr && ((attr->collectionNamespace() == "usertoplevel") || (attr->collectionNamespace() == "usertoplevel"))) {
+        if (attr && ((attr->collectionNamespace() == "usertoplevel") || (attr->collectionNamespace() == "usertoplevel"))
+                || (col.name().contains(QLatin1String("Other Users")))) {
             return false;
         }
         return true;