diff --git a/ChangeLog b/ChangeLog index bbc599857..6ce1b0e73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ (sogo_op_modifyrecipients): replaced methods with pocop implementations. (sogo_op_*attach*): methods to their final form' + (sogo_op_get_fid_by_name): removed obsolete method. + (sogo_op_release_record): removed obsolete method. * OpenChange/NSObject+MAPIStore.m (MAPIStoreTallocWrapperDestroy): the object release now occurs within an NSAutoreleasePool. @@ -35,9 +37,6 @@ * Tools/sogo-tool.m (main): instantiate SOGoSystemDefaults in order to properly inject the entries from SOGoDefaults.plist. - * OpenChange/MAPIStoreSOGo.m (sogo_op_get_fid_by_name): removed - obsolete method. - 2011-07-12 Francis Lachapelle * UI/MailerUI/UIxMailFolderActions.m (-batchDeleteAction): we diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h index 407aed9f4..882d9dbda 100644 --- a/OpenChange/MAPIStoreContext.h +++ b/OpenChange/MAPIStoreContext.h @@ -135,8 +135,6 @@ - (int) deleteMessageWithMID: (uint64_t) mid inFID: (uint64_t) fid withFlags: (uint8_t) flags; -- (int) releaseRecordWithFMID: (uint64_t) fmid - ofTableType: (uint8_t) tableType; /* util methods */ - (NSString *) extractChildNameFromURL: (NSString *) childURL diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m index 455877c99..6d05e6bbb 100644 --- a/OpenChange/MAPIStoreContext.m +++ b/OpenChange/MAPIStoreContext.m @@ -982,53 +982,6 @@ _prepareContextClass (struct mapistore_context *newMemCtx, return rc; } -- (int) releaseRecordWithFMID: (uint64_t) fmid - ofTableType: (uint8_t) tableType -{ - NSNumber *fidKey; - MAPIStoreObject *child; - NSUInteger retainCount; - int rc = MAPISTORE_SUCCESS; - - if (tableType != MAPISTORE_FOLDER_TABLE) - { - [self errorWithFormat: @"%s: value of tableType not handled: %d", - __FUNCTION__, tableType]; - [self logWithFormat: @" fmid: 0x%.16x tableType: %d", fmid, tableType]; - [NSException raise: @"MAPIStoreAPIException" - format: @"unsupported object type"]; - - rc = MAPISTORE_ERR_INVALID_PARAMETER; - } - - if (rc == MAPISTORE_SUCCESS) - { - fidKey = [NSNumber numberWithUnsignedLongLong: fmid]; - child = [folders objectForKey: fidKey]; - if (child) - { - retainCount = [child mapiRetainCount]; - if (retainCount == 0) - { - [self logWithFormat: @"child with mid %.16x successfully removed" - @" from child cache", - fmid]; - [folders removeObjectForKey: fidKey]; - } - else - [child setMAPIRetainCount: retainCount - 1]; - } - else - { - [self warnWithFormat: @"child with mid %.16x not found" - @" in child cache", fmid]; - rc = MAPISTORE_ERR_NOT_FOUND; - } - } - - return rc; -} - /* utils */ - (NSString *) extractChildNameFromURL: (NSString *) objectURL diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index 82ed10966..d5308776b 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -166,39 +166,6 @@ sogo_delete_context(void *private_data) return MAPISTORE_SUCCESS; } -/** - \details Delete data associated to a given folder or message - - \param private_data pointer to the current sogo context - - \return MAPISTORE_SUCCESS on success, otherwise MAPISTORE_ERROR -*/ -static int -sogo_release_record(void *private_data, uint64_t fmid, uint8_t type) -{ - NSAutoreleasePool *pool; - sogo_context *cContext; - MAPIStoreContext *context; - int rc; - - pool = [NSAutoreleasePool new]; - - DEBUG (5, ("[SOGo: %s:%d]\n", __FUNCTION__, __LINE__)); - - cContext = private_data; - context = cContext->objcContext; - [context setupRequest]; - - rc = [context releaseRecordWithFMID: fmid ofTableType: type]; - - [context tearDownRequest]; - - [pool release]; - - return rc; -} - - /** \details return the mapistore path associated to a given message or folder ID @@ -1079,7 +1046,6 @@ int mapistore_init_backend(void) backend.init = sogo_init; backend.create_context = sogo_create_context; backend.delete_context = sogo_delete_context; - backend.release_record = sogo_release_record; backend.get_path = sogo_get_path;