Monotone-Parent: 599ccb5bc0882492dab453f5e9af28f0342e6a87

Monotone-Revision: aff6a2cc9b4208ab638ccf2f17af6bb0874f5f5b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-03T14:58:33
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreCalendarContext.m

@@ -46,7 +46,7 @@ static Class MAPIStoreCalendarFolderK;
   return @"calendar";
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
++ (enum mapistore_context_role) MAPIContextRole
 {
   return MAPISTORE_CALENDAR_ROLE;
 }

OpenChange/MAPIStoreContactsContext.m

@@ -46,7 +46,7 @@ static Class MAPIStoreContactsFolderK;
   return @"contacts";
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
++ (enum mapistore_context_role) MAPIContextRole
 {
   return MAPISTORE_CONTACTS_ROLE;
 }

OpenChange/MAPIStoreGCSBaseContext.m

@@ -43,11 +43,6 @@
   return nil;
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
-{
-  return -1;
-}
-
 + (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName
                                          withTDBIndexing: (struct tdb_wrap *) indexingTdb
                                                 inMemCtx: (TALLOC_CTX *) memCtx
@@ -83,7 +78,7 @@
               context->name = [[currentFolder displayName]
                                 asUnicodeInMemCtx: context];
               context->main_folder = [nameInContainer isEqualToString: @"personal"];
-              context->role = [self MAPIModuleRole];
+              context->role = [self MAPIContextRole];
               context->tag = "tag";
               DLIST_ADD_END (firstContext, context, void);
             }

OpenChange/MAPIStoreTasksContext.m

@@ -45,7 +45,7 @@ static Class MAPIStoreTasksFolderK;
   return @"tasks";
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
++ (enum mapistore_context_role) MAPIContextRole
 {
   return MAPISTORE_TASKS_ROLE;
 }