diff --git a/ChangeLog b/ChangeLog index dabf1ed30..f07e56ffb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-08-13 Wolfgang Sourdeau + * OpenChange/MAPIStoreSOGo.m (sogo_properties_get_uri): removed + useless backend method. + * OpenChange/MAPIStoreFolder.m (-createFolder:withRow:andFID:): append a "/" to the new folder url when registering with the url/id mapper. diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h index 6918184a4..ddb28ada0 100644 --- a/OpenChange/MAPIStoreObject.h +++ b/OpenChange/MAPIStoreObject.h @@ -68,9 +68,6 @@ - (NSMutableDictionary *) properties; /* ops */ -- (enum mapistore_error) getURI: (char **) uriP - inMemCtx: (TALLOC_CTX *) memCtx; - - (int) getProperties: (struct mapistore_property_data *) data withTags: (enum MAPITAGS *) tags andCount: (uint16_t) columnCount diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m index a751927e4..eba69c966 100644 --- a/OpenChange/MAPIStoreObject.m +++ b/OpenChange/MAPIStoreObject.m @@ -150,24 +150,6 @@ static Class NSExceptionK, MAPIStoreFolderK; return properties; } -- (enum mapistore_error) getURI: (char **) uriP - inMemCtx: (TALLOC_CTX *) memCtx -{ - enum mapistore_error rc; - NSString *url; - - url = [self url]; - if (url) - { - *uriP = [url asUnicodeInMemCtx: memCtx]; - rc = MAPISTORE_SUCCESS; - } - else - rc = MAPISTORE_ERR_NOT_FOUND; - - return rc; -} - - (int) getProperty: (void **) data withTag: (enum MAPITAGS) propTag inMemCtx: (TALLOC_CTX *) memCtx diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index 8d31a11dc..276bd6268 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -1325,35 +1325,6 @@ sogo_table_handle_destructor (void *table_object, uint32_t handle_id) return rc; } -static enum mapistore_error sogo_properties_get_uri(void *object, - TALLOC_CTX *mem_ctx, - char **uriP) -{ - struct MAPIStoreTallocWrapper *wrapper; - NSAutoreleasePool *pool; - MAPIStoreObject *propObject; - int rc; - - DEBUG (5, ("[SOGo: %s:%d]\n", __FUNCTION__, __LINE__)); - - if (object) - { - wrapper = object; - propObject = wrapper->instance; - GSRegisterCurrentThread (); - pool = [NSAutoreleasePool new]; - rc = [propObject getURI: uriP inMemCtx: mem_ctx]; - [pool release]; - GSUnregisterCurrentThread (); - } - else - { - rc = sogo_backend_unexpected_error(); - } - - return rc; -} - static enum mapistore_error sogo_properties_get_available_properties(void *object, TALLOC_CTX *mem_ctx, struct SPropTagArray **propertiesP) @@ -1546,7 +1517,6 @@ int mapistore_init_backend(void) backend.table.get_row = sogo_table_get_row; backend.table.get_row_count = sogo_table_get_row_count; backend.table.handle_destructor = sogo_table_handle_destructor; - backend.properties.get_uri = sogo_properties_get_uri; backend.properties.get_available_properties = sogo_properties_get_available_properties; backend.properties.get_properties = sogo_properties_get_properties; backend.properties.set_properties = sogo_properties_set_properties;