Monotone-Parent: 3b8c41adf2fbd28bd91312ef68f3f4faa8ef381f
Monotone-Revision: 22a3b958acddeb274e788d95f5da332880c64d78 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-08-13T19:55:50 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
de46251676
commit
07a376b461
|
@ -1,5 +1,8 @@
|
||||||
2012-08-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2012-08-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* OpenChange/MAPIStoreSOGo.m (sogo_properties_get_uri): removed
|
||||||
|
useless backend method.
|
||||||
|
|
||||||
* OpenChange/MAPIStoreFolder.m (-createFolder:withRow:andFID:):
|
* OpenChange/MAPIStoreFolder.m (-createFolder:withRow:andFID:):
|
||||||
append a "/" to the new folder url when registering with the
|
append a "/" to the new folder url when registering with the
|
||||||
url/id mapper.
|
url/id mapper.
|
||||||
|
|
|
@ -68,9 +68,6 @@
|
||||||
- (NSMutableDictionary *) properties;
|
- (NSMutableDictionary *) properties;
|
||||||
|
|
||||||
/* ops */
|
/* ops */
|
||||||
- (enum mapistore_error) getURI: (char **) uriP
|
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx;
|
|
||||||
|
|
||||||
- (int) getProperties: (struct mapistore_property_data *) data
|
- (int) getProperties: (struct mapistore_property_data *) data
|
||||||
withTags: (enum MAPITAGS *) tags
|
withTags: (enum MAPITAGS *) tags
|
||||||
andCount: (uint16_t) columnCount
|
andCount: (uint16_t) columnCount
|
||||||
|
|
|
@ -150,24 +150,6 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
||||||
return properties;
|
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
|
- (int) getProperty: (void **) data
|
||||||
withTag: (enum MAPITAGS) propTag
|
withTag: (enum MAPITAGS) propTag
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx
|
inMemCtx: (TALLOC_CTX *) memCtx
|
||||||
|
|
|
@ -1325,35 +1325,6 @@ sogo_table_handle_destructor (void *table_object, uint32_t handle_id)
|
||||||
return rc;
|
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,
|
static enum mapistore_error sogo_properties_get_available_properties(void *object,
|
||||||
TALLOC_CTX *mem_ctx,
|
TALLOC_CTX *mem_ctx,
|
||||||
struct SPropTagArray **propertiesP)
|
struct SPropTagArray **propertiesP)
|
||||||
|
@ -1546,7 +1517,6 @@ int mapistore_init_backend(void)
|
||||||
backend.table.get_row = sogo_table_get_row;
|
backend.table.get_row = sogo_table_get_row;
|
||||||
backend.table.get_row_count = sogo_table_get_row_count;
|
backend.table.get_row_count = sogo_table_get_row_count;
|
||||||
backend.table.handle_destructor = sogo_table_handle_destructor;
|
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_available_properties = sogo_properties_get_available_properties;
|
||||||
backend.properties.get_properties = sogo_properties_get_properties;
|
backend.properties.get_properties = sogo_properties_get_properties;
|
||||||
backend.properties.set_properties = sogo_properties_set_properties;
|
backend.properties.set_properties = sogo_properties_set_properties;
|
||||||
|
|
Loading…
Reference in a new issue