merge of '55d114b1af490a0c317169a03805f2c3a6873525'

and '8c5a9e9cc065204a82679aa77cc03ea009be7cfd'

Monotone-Parent: 55d114b1af490a0c317169a03805f2c3a6873525
Monotone-Parent: 8c5a9e9cc065204a82679aa77cc03ea009be7cfd
Monotone-Revision: 6e6ddde0b781ba8a6c4605edf730ec8e82cded23

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-03T17:24:10
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -9,6 +9,14 @@
 
 2012-02-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolderTable.m
+	(-evaluatePropertyRestriction:intoQualifier:): overriden method to
+	always return true for restrictions on PR_CHANGE_NUM, in order to
+	help the fxics mechanism.
+
+	* OpenChange/MAPIStoreFolder.m (-deleteFolder): cleanup the caches
+	in order to let the folder disappear.
+
 	* OpenChange/MAPIStoreSOGo.m (sogo_backend_create_root_folder):
 	new backend method.
 

OpenChange/MAPIStoreFolder.m

@@ -388,6 +388,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   [propsFolder delete];
   [faiFolder delete];
 
+  [self cleanupCaches];
+
   return MAPISTORE_SUCCESS;
 }
 

OpenChange/MAPIStoreFolderTable.m

@@ -85,6 +85,26 @@
   return restrictedChildKeys;
 }
 
+- (MAPIRestrictionState) evaluatePropertyRestriction: (struct mapi_SPropertyRestriction *) res
+				       intoQualifier: (EOQualifier **) qualifier
+{
+  MAPIRestrictionState rc;
+
+  switch ((uint32_t) res->ulPropTag)
+    {
+      /* HACK: we cheat here as we current have no mechanism for searching
+         folders based on PR_CHANGE_NUM, which is used by the oxcfxics
+         mechanism... */
+    case PR_CHANGE_NUM:
+      rc = MAPIRestrictionStateAlwaysTrue;
+      break;
+    default:
+      rc = [super evaluatePropertyRestriction: res intoQualifier: qualifier];
+    }
+
+  return rc;
+}
+
 - (id) lookupChild: (NSString *) childKey
 {
   return [(MAPIStoreFolder *) container lookupFolder: childKey];