propagate from branch 'ca.inverse.sogo.1_3_17' (head 6105680d967d026c63b9b9f96cb3aeae9884e804)

to branch 'ca.inverse.sogo' (head b664e2e19975c70a7614aa975a3a045f0bec7ec3)

Monotone-Parent: 6105680d967d026c63b9b9f96cb3aeae9884e804
Monotone-Parent: b664e2e19975c70a7614aa975a3a045f0bec7ec3
Monotone-Revision: 6748af72ecdd0c613acb968eb261448ae6b6982d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-18T17:21:48
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2012-06-18 17:21:48 +00:00
commit b35f5f0ecb
2 changed files with 8 additions and 3 deletions

View File

@ -294,9 +294,11 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
[MAPIStoreUserContext userContextWithUsername: username
andTDBIndexing: indexingTdb]);
#if 0
mapistore_mgmt_backend_register_user (newConnInfo,
"SOGo",
[username UTF8String]);
#endif
connInfo = newConnInfo;
username = [NSString stringWithUTF8String: newConnInfo->username];
@ -315,9 +317,12 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
- (void) dealloc
{
#if 0
mapistore_mgmt_backend_unregister_user ([self connectionInfo], "SOGo",
[[userContext username]
UTF8String]);
#endif
[contextUrl release];
[userContext release];
[containersBag release];

View File

@ -2,6 +2,6 @@
# This file is included by library makefiles to set the version information
# of the executable.
MAJOR_VERSION=1
MINOR_VERSION=3
SUBMINOR_VERSION=17
MAJOR_VERSION=2
MINOR_VERSION=0
SUBMINOR_VERSION=0