Monotone-Parent: 425bfc2f774ffc6abc9a76908ac1b2fcf7d6ad14

Monotone-Revision: 82a617e3ad7bb1a96e181c9d1c240bc2c89de7f7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-03T15:05:19
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-02-03 15:05:19 +00:00
parent 3bf138283b
commit d64c7164d7
5 changed files with 30 additions and 20 deletions

View File

@@ -354,8 +354,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
rc = MAPISTORE_ERR_EXIST;
else
{
folderKey = [self createFolder: aRow withFID: fid];
if (folderKey)
rc = [self createFolder: aRow withFID: fid andKey: &folderKey];
if (rc == MAPISTORE_SUCCESS)
{
[self cleanupCaches];
baseURL = [self url];
@@ -374,8 +374,6 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
[NSException raise: @"MAPIStoreIOException"
format: @"unable to fetch created folder"];
}
else
rc = MAPISTORE_ERROR;
}
}
else
@@ -1299,12 +1297,13 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
return newMessage;
}
- (NSString *) createFolder: (struct SRow *) aRow
withFID: (uint64_t) newFID
- (enum mapistore_error) createFolder: (struct SRow *) aRow
withFID: (uint64_t) newFID
andKey: (NSString **) newKeyP
{
[self errorWithFormat: @"new folders cannot be created in this context"];
return nil;
return MAPISTORE_ERR_DENIED;
}
/* helpers */