From f47d22f19ff6306306826a5ac4b89fb2c0ab7853 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 12 Jul 2011 21:59:04 +0000
Subject: [PATCH] Monotone-Parent: 52f97967a551afb1284c9e0105d60c36d40f471a
 Monotone-Revision: c8fd48b8c8d9b7448bdeed036dda351e575cb5df

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-12T21:59:04
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                     |  5 ++-
 OpenChange/MAPIStoreContext.h |  8 ----
 OpenChange/MAPIStoreContext.m | 32 ----------------
 OpenChange/MAPIStoreSOGo.m    | 70 -----------------------------------
 4 files changed, 3 insertions(+), 112 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8212eaf47..f7967ba22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,8 +21,9 @@
 	(+getAvailableProperties:inMemCtx:): added memCtx parameter.
 
 	* OpenChange/MAPIStoreSOGo.m: (sogo_op_get_table_property)
-	(sogo_op_get_available_table_properties): removed obsolete
-	methods.
+	(sogo_op_get_available_table_properties)
+	(sogo_op_set_restrictions,sogo_op_set_sort_order): removed
+	obsolete methods.
 
 	* OpenChange/MAPIStoreCalendarMessageTable.m,
 	OpenChange/MAPIStoreContactsMessageTable.m,
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index 680492b23..18d521bf9 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -111,14 +111,6 @@
         byName: (const char *) foldername
    inParentFID: (uint64_t) parent_fid;
 
-- (int) setRestrictions: (const struct mapi_SRestriction *) res
-		withFID: (uint64_t) fid
-	   andTableType: (uint8_t) tableType
-	 getTableStatus: (uint8_t *) tableStatus;
-- (int) setSortOrder: (const struct SSortOrderSet *) set
-             withFID: (uint64_t) fid andTableType: (uint8_t) type
-      getTableStatus: (uint8_t *) tableStatus;
-
 - (int) mkDir: (struct SRow *) aRow
       withFID: (uint64_t) fid
   inParentFID: (uint64_t) parentFID;
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index bc2f6973d..a6dc2f98a 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -644,38 +644,6 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
 //   [self logWithFormat: @"%@  -->  %@", resStr, MAPIStringForRestrictionState (state)];
 // }
 
-- (int) setRestrictions: (const struct mapi_SRestriction *) res
-		withFID: (uint64_t) fid
-	   andTableType: (uint8_t) tableType
-	 getTableStatus: (uint8_t *) tableStatus
-{
-  MAPIStoreTable *table;
-
-  [self errorWithFormat: @"%s: obsolete method", __FUNCTION__];
-
-  table = [self _tableForFID: fid andTableType: tableType];
-  [table setRestrictions: res];
-  // FIXME: we should not flush the caches if the restrictions matches
-  [table cleanupCaches];
-
-  return MAPISTORE_SUCCESS;
-}
-
-- (int) setSortOrder: (const struct SSortOrderSet *) set
-             withFID: (uint64_t) fid andTableType: (uint8_t) type
-      getTableStatus: (uint8_t *) tableStatus
-{
-  MAPIStoreTable *table;
-
-  [self errorWithFormat: @"%s: obsolete method", __FUNCTION__];
-
-  table = [self _tableForFID: fid andTableType: type];
-  [table setSortOrder: set];
-  [table cleanupCaches];
-
-  return MAPISTORE_SUCCESS;
-}
-
 - (int) openMessage: (struct mapistore_message *) msg
             withMID: (uint64_t) mid
               inFID: (uint64_t) fid
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index d801d3825..d7048e3a5 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -656,74 +656,6 @@ sogo_op_deletemessage(void *private_data,
   return rc;
 }
 
-static int
-sogo_op_set_restrictions (void *private_data, uint64_t fid, uint8_t type,
-			  struct mapi_SRestriction *res, uint8_t *tableStatus)
-{
-  NSAutoreleasePool *pool;
-  sogo_context *cContext;
-  MAPIStoreContext *context;
-  int rc;
-
-  DEBUG (5, ("[SOGo: %s:%d]\n", __FUNCTION__, __LINE__));
-
-  pool = [NSAutoreleasePool new];
-
-  cContext = private_data;
-  context = cContext->objcContext;
-  if (context)
-    {
-      [context setupRequest];
-
-      rc = [context setRestrictions: res
-		    withFID: fid andTableType: type
-		    getTableStatus: tableStatus];
-
-      [context tearDownRequest];
-      [pool release];
-    }
-  else
-    {
-      NSLog (@"  UNEXPECTED WEIRDNESS: RECEIVED NO CONTEXT");
-      rc = MAPI_E_NOT_FOUND;
-    }
-
-  return rc;
-}
-
-static int
-sogo_op_set_sort_order (void *private_data, uint64_t fid, uint8_t type,
-                        struct SSortOrderSet *set, uint8_t *tableStatus)
-{
-  NSAutoreleasePool *pool;
-  sogo_context *cContext;
-  MAPIStoreContext *context;
-  int rc;
-
-  DEBUG (5, ("[SOGo: %s:%d]\n", __FUNCTION__, __LINE__));
-
-  pool = [NSAutoreleasePool new];
-
-  cContext = private_data;
-  context = cContext->objcContext;
-  if (context)
-    {
-      [context setupRequest];
-      rc = [context setSortOrder: set
-                         withFID: fid andTableType: type
-                  getTableStatus: tableStatus];
-      [context tearDownRequest];
-      [pool release];
-    }
-  else
-    {
-      NSLog (@"  UNEXPECTED WEIRDNESS: RECEIVED NO CONTEXT");
-      rc = MAPI_E_NOT_FOUND;
-    }
-
-  return rc;
-}
-
 /**
    proof of concept
 */
@@ -1173,8 +1105,6 @@ int mapistore_init_backend(void)
       backend.op_opendir = sogo_op_opendir;
       backend.op_closedir = sogo_op_closedir;
       backend.op_readdir_count = sogo_op_readdir_count;
-      backend.op_set_restrictions = sogo_op_set_restrictions;
-      backend.op_set_sort_order = sogo_op_set_sort_order;
       backend.op_openmessage = sogo_op_openmessage;
       backend.op_createmessage = sogo_op_createmessage;
       backend.op_modifyrecipients = sogo_op_modifyrecipients;