[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/runtime/resources/kolabproxy
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-11-20 17:48:18
Message-ID: 20101120174818.73BB6AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199122 by smartins:

Uncomment, ACL checking is working fine now.

 M  +2 -4      incidencehandler.cpp  
 M  +0 -2      kolabproxyresource.cpp  


--- trunk/KDE/kdepim/runtime/resources/kolabproxy/incidencehandler.cpp \
#1199121:1199122 @@ -74,16 +74,14 @@
                  << "; collection has rights "
                  << m_imapCollection.rights();
 
-        /*
         const Akonadi::Collection::Rights requiredRights = \
                Akonadi::Collection::CanDeleteItem |
                                                            \
Akonadi::Collection::CanCreateItem;  
         if ( ( m_imapCollection.rights() & requiredRights ) != requiredRights ) {
-          kDebug() << "Skipping conflict resolution, no rights on collection " << \
item.parentCollection().name(); +          kDebug() << "Skipping conflict resolution, \
no rights on collection " << m_imapCollection.name();  continue;
-        }*/
+        }
 
-
         ConflictResolution res = resolveConflict(incidencePtr);
         kDebug() << "ConflictResolution " << res;
         if (res == Local) {
--- trunk/KDE/kdepim/runtime/resources/kolabproxy/kolabproxyresource.cpp \
#1199121:1199122 @@ -147,7 +147,6 @@
   m_retrieveState = RetrieveItems;
   ItemFetchJob *job = new ItemFetchJob( kolabToImap( collection ) );
   job->fetchScope().fetchFullPayload();
-  job->fetchScope().setAncestorRetrieval( ItemFetchScope::Parent );
 
   connect(job, SIGNAL(result(KJob*)), this, SLOT(retrieveItemFetchDone(KJob *)));
 }
@@ -159,7 +158,6 @@
   m_retrieveState = RetrieveItem;
   ItemFetchJob *job = new ItemFetchJob( kolabToImap( item ) );
   job->fetchScope().fetchFullPayload();
-  job->fetchScope().setAncestorRetrieval( ItemFetchScope::Parent );
   connect(job, SIGNAL(result(KJob*)), this, SLOT(retrieveItemFetchDone(KJob *)));
   return true;
 }


[prev in list] [next in list] [prev in thread] [next in thread]