propagate from branch 'ca.inverse.sogo.1_3_17' (head 7658ec99af152b2743393d20c3c4f2c23610ec4c)

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

Monotone-Parent: 7658ec99af152b2743393d20c3c4f2c23610ec4c
Monotone-Parent: c69af3e4b83d5cab3a52701fb736c8a149697338
Monotone-Revision: fe40ce2ccc4fc2a690968594698949dc4b73f035

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-20T14:06:09
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreContext.m

@@ -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];

Version

@@ -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