From 83709fd892d725b8099aa2e5a470af0f0e9612df Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Jan 2012 19:54:36 +0000 Subject: [PATCH 1/5] Monotone-Parent: 3dc6d9dff558dfb935fde8eee2c978d9a9d1a774 Monotone-Revision: e89a46b719b80b6d34d9e7a110754e60344dd669 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-01-26T19:54:36 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 12 +++++++ OpenChange/MAPIStoreCalendarContext.m | 20 ++++++++++++ OpenChange/MAPIStoreContactsContext.m | 20 ++++++++++++ OpenChange/MAPIStoreContext.h | 5 +++ OpenChange/MAPIStoreContext.m | 34 +++++++++++++++++++ OpenChange/MAPIStoreMailContext.m | 47 +++++++++++++++++++++++++++ OpenChange/MAPIStoreNotesContext.m | 20 ++++++++++++ OpenChange/MAPIStoreSOGo.m | 36 ++++++++++++++++++-- OpenChange/MAPIStoreTasksContext.m | 20 ++++++++++++ 9 files changed, 211 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41234139a..cf40d5ec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-01-26 Wolfgang Sourdeau + + * OpenChange/MAPIStoreSOGo.m (sogo_backend_list_contexts): new + backend method. + + * OpenChange/MAPIStoreContext.m + (+listAllContextsForUser:inMemCtx:): centralized method for + returning all contexts available from all context classes for one + user. + (+listContextsForUser:inMemCtx:): new individual method invoked by + the above. Overridden by concrete subclasses. + 2012-01-26 Ludovic Marcotte * SoObjects/SOGo/LDAPSource.{h,m} - now honor diff --git a/OpenChange/MAPIStoreCalendarContext.m b/OpenChange/MAPIStoreCalendarContext.m index b3cbb2899..8f05ceb17 100644 --- a/OpenChange/MAPIStoreCalendarContext.m +++ b/OpenChange/MAPIStoreCalendarContext.m @@ -27,6 +27,9 @@ #import "MAPIStoreCalendarContext.h" +#undef DEBUG +#include + @implementation MAPIStoreCalendarContext + (NSString *) MAPIModuleName @@ -34,6 +37,23 @@ return @"calendar"; } ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + struct mapistore_contexts_list *context; + + context = talloc_zero(memCtx, struct mapistore_contexts_list); + context->url = talloc_asprintf (context, "sogo://%s@calendar/", + [userName UTF8String]); + // context->name = "Agenda personnel"; + context->main_folder = true; + context->role = MAPISTORE_CALENDAR_ROLE; + context->tag = "tag"; + context->prev = context; + + return context; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreCalendarFolder baseFolderWithURL: newURL diff --git a/OpenChange/MAPIStoreContactsContext.m b/OpenChange/MAPIStoreContactsContext.m index 4a266ac30..34b6257e8 100644 --- a/OpenChange/MAPIStoreContactsContext.m +++ b/OpenChange/MAPIStoreContactsContext.m @@ -27,6 +27,9 @@ #import "MAPIStoreContactsContext.h" +#undef DEBUG +#include + @implementation MAPIStoreContactsContext + (NSString *) MAPIModuleName @@ -34,6 +37,23 @@ return @"contacts"; } ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + struct mapistore_contexts_list *context; + + context = talloc_zero(memCtx, struct mapistore_contexts_list); + context->url = talloc_asprintf (context, "sogo://%s@contacts/", + [userName UTF8String]); + // context->name = "Carnet d'adresses personnel"; + context->main_folder = true; + context->role = MAPISTORE_CONTACTS_ROLE; + context->tag = "tag"; + context->prev = context; + + return context; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreContactsFolder baseFolderWithURL: newURL diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h index 09774238d..88c902e42 100644 --- a/OpenChange/MAPIStoreContext.h +++ b/OpenChange/MAPIStoreContext.h @@ -69,6 +69,11 @@ MAPIStoreFolder *baseFolder; } ++ (struct mapistore_contexts_list *) listAllContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx; ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx; + + (int) openContext: (MAPIStoreContext **) contextPtr withURI: (const char *) newUri connectionInfo: (struct mapistore_connection_info *) newConnInfo diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m index 07ac7116a..9b6a40b46 100644 --- a/OpenChange/MAPIStoreContext.m +++ b/OpenChange/MAPIStoreContext.m @@ -101,6 +101,40 @@ static NSMutableDictionary *contextClassMapping; } } + ++ (struct mapistore_contexts_list *) listAllContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + struct mapistore_contexts_list *list, *current; + NSArray *classes; + Class currentClass; + NSUInteger count, max; + + list = NULL; + + classes = GSObjCAllSubclassesOfClass (self); + max = [classes count]; + for (count = 0; count < max; count++) + { + currentClass = [classes objectAtIndex: count]; + current = [currentClass listContextsForUser: userName + inMemCtx: memCtx]; + if (current) + { + [self logWithFormat: @"adding list: %p", current]; + DLIST_CONCATENATE(list, current, void); + } + } + + return list; +} + ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + return NULL; +} + static inline enum mapistore_error _prepareContextClass (Class contextClass, struct mapistore_connection_info *connInfo, diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m index 0ca511936..f4885f10b 100644 --- a/OpenChange/MAPIStoreMailContext.m +++ b/OpenChange/MAPIStoreMailContext.m @@ -24,9 +24,13 @@ #import "MAPIStoreMailFolder.h" #import "MAPIStoreMapping.h" +#import "NSString+MAPIStore.h" #import "MAPIStoreMailContext.h" +#undef DEBUG +#include + @implementation MAPIStoreMailContext + (NSString *) MAPIModuleName @@ -34,6 +38,11 @@ return nil; } ++ (enum mapistore_context_role) contextRole +{ + return MAPISTORE_MAIL_ROLE; +} + @end @implementation MAPIStoreInboxContext @@ -43,6 +52,24 @@ return @"inbox"; } ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + struct mapistore_contexts_list *context; + NSString *url; + + context = talloc_zero(memCtx, struct mapistore_contexts_list); + url = [NSString stringWithFormat: @"sogo://%@:%@@%@/", userName, userName, [self MAPIModuleName]]; + context->url = [url asUnicodeInMemCtx: context]; + // context->name = "Inbox"; + context->main_folder = true; + context->role = [self contextRole]; + context->tag = "tag"; + context->prev = context; + + return context; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreInboxFolder baseFolderWithURL: newURL @@ -59,6 +86,11 @@ return @"sent-items"; } ++ (enum mapistore_context_role) contextRole +{ + return MAPISTORE_SENTITEMS_ROLE; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreSentItemsFolder baseFolderWithURL: newURL @@ -75,6 +107,11 @@ return @"drafts"; } ++ (enum mapistore_context_role) contextRole +{ + return MAPISTORE_DRAFTS_ROLE; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreDraftsFolder baseFolderWithURL: newURL @@ -93,6 +130,11 @@ return @"deleted-items"; } ++ (enum mapistore_context_role) contextRole +{ + return MAPISTORE_DELETEDITEMS_ROLE; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreFSFolder baseFolderWithURL: newURL inContext: self]; @@ -115,6 +157,11 @@ return @"outbox"; } ++ (enum mapistore_context_role) contextRole +{ + return MAPISTORE_OUTBOX_ROLE; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreOutboxFolder baseFolderWithURL: newURL diff --git a/OpenChange/MAPIStoreNotesContext.m b/OpenChange/MAPIStoreNotesContext.m index 7171f7da0..b6ca62bc3 100644 --- a/OpenChange/MAPIStoreNotesContext.m +++ b/OpenChange/MAPIStoreNotesContext.m @@ -27,6 +27,9 @@ #import "MAPIStoreNotesContext.h" +#undef DEBUG +#include + @implementation MAPIStoreNotesContext + (NSString *) MAPIModuleName @@ -34,6 +37,23 @@ return @"notes"; } ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + struct mapistore_contexts_list *context; + + context = talloc_zero(memCtx, struct mapistore_contexts_list); + context->url = talloc_asprintf (context, "sogo://%s@notes/", + [userName UTF8String]); + // context->name = "Notes personnelles"; + context->main_folder = true; + context->role = MAPISTORE_NOTES_ROLE; + context->tag = "tag"; + context->prev = context; + + return context; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreNotesFolder baseFolderWithURL: newURL diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index 527da32ec..7f6878f96 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -46,6 +46,8 @@ #include #include +static Class MAPIStoreContextK = Nil; + static enum mapistore_error sogo_backend_unexpected_error() { @@ -81,7 +83,7 @@ sogo_backend_init (void) [SOGoSystemDefaults sharedSystemDefaults]; - // /* We force the plugin to base its configuration on the SOGo tree. */ + /* We force the plugin to base its configuration on the SOGo tree. */ ud = [NSUserDefaults standardUserDefaults]; [ud registerDefaults: [ud persistentDomainForName: @"sogod"]]; @@ -98,6 +100,8 @@ sogo_backend_init (void) [[SOGoCache sharedCache] disableRequestsCache]; [[SOGoCache sharedCache] disableLocalCache]; + MAPIStoreContextK = NSClassFromString (@"MAPIStoreContext"); + [pool release]; return MAPISTORE_SUCCESS; @@ -118,7 +122,6 @@ sogo_backend_create_context(TALLOC_CTX *mem_ctx, const char *uri, void **context_object) { NSAutoreleasePool *pool; - Class MAPIStoreContextK; MAPIStoreContext *context; int rc; @@ -126,7 +129,6 @@ sogo_backend_create_context(TALLOC_CTX *mem_ctx, pool = [NSAutoreleasePool new]; - MAPIStoreContextK = NSClassFromString (@"MAPIStoreContext"); if (MAPIStoreContextK) { rc = [MAPIStoreContextK openContext: &context @@ -144,6 +146,33 @@ sogo_backend_create_context(TALLOC_CTX *mem_ctx, return rc; } +static enum mapistore_error +sogo_backend_list_contexts(const char *username, TALLOC_CTX *mem_ctx, + struct mapistore_contexts_list **contexts_listp) +{ + NSAutoreleasePool *pool; + NSString *userName; + int rc; + + DEBUG(0, ("[SOGo: %s:%d]\n", __FUNCTION__, __LINE__)); + + pool = [NSAutoreleasePool new]; + + if (MAPIStoreContextK) + { + userName = [NSString stringWithUTF8String: username]; + *contexts_listp = [MAPIStoreContextK listAllContextsForUser: userName + inMemCtx: mem_ctx]; + rc = MAPISTORE_SUCCESS; + } + else + rc = MAPISTORE_ERROR; + + [pool release]; + + return rc; +} + // andFID: fid // uint64_t fid, // void **private_data) @@ -1207,6 +1236,7 @@ int mapistore_init_backend(void) backend.backend.namespace = "sogo://"; backend.backend.init = sogo_backend_init; backend.backend.create_context = sogo_backend_create_context; + backend.backend.list_contexts = sogo_backend_list_contexts; backend.context.get_path = sogo_context_get_path; backend.context.get_root_folder = sogo_context_get_root_folder; backend.folder.open_folder = sogo_folder_open_folder; diff --git a/OpenChange/MAPIStoreTasksContext.m b/OpenChange/MAPIStoreTasksContext.m index 1d71c56da..644176aa3 100644 --- a/OpenChange/MAPIStoreTasksContext.m +++ b/OpenChange/MAPIStoreTasksContext.m @@ -27,6 +27,9 @@ #import "MAPIStoreTasksContext.h" +#undef DEBUG +#include + @implementation MAPIStoreTasksContext + (NSString *) MAPIModuleName @@ -34,6 +37,23 @@ return @"tasks"; } ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + struct mapistore_contexts_list *context; + + context = talloc_zero(memCtx, struct mapistore_contexts_list); + context->url = talloc_asprintf (context, "sogo://%s@tasks/", + [userName UTF8String]); + // context->name = "Tâches personnelles"; + context->main_folder = true; + context->role = MAPISTORE_TASKS_ROLE; + context->tag = "tag"; + context->prev = context; + + return context; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreTasksFolder baseFolderWithURL: newURL From ada80546fde81969415a003ebf783a23cc8e2fb2 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Jan 2012 19:56:24 +0000 Subject: [PATCH 2/5] Monotone-Parent: e89a46b719b80b6d34d9e7a110754e60344dd669 Monotone-Revision: bc440bc0c22c32437dc043e9566760ddd30fea67 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-01-26T19:56:24 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ OpenChange/MAPIStoreFSFolder.m | 5 +++++ OpenChange/MAPIStoreFolder.m | 8 +++++++- OpenChange/MAPIStoreMailFolder.m | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cf40d5ec9..01919d3e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-01-26 Wolfgang Sourdeau + * OpenChange/MAPIStoreFolder.m (supportsSubFolders): new + overridable method that returns whether the current folder can + contain subfolders, nowithstanding the right of the current user + to create or access them. + * OpenChange/MAPIStoreSOGo.m (sogo_backend_list_contexts): new backend method. diff --git a/OpenChange/MAPIStoreFSFolder.m b/OpenChange/MAPIStoreFSFolder.m index bb6cf3d7b..8e8ab1ef6 100644 --- a/OpenChange/MAPIStoreFSFolder.m +++ b/OpenChange/MAPIStoreFSFolder.m @@ -295,4 +295,9 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact"; return [self _testRoleForActiveUser: MAPIStoreRightCreateSubfolders]; } +- (BOOL) supportsSubFolders +{ + return YES; +} + @end diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m index 155991b42..a8384bb5b 100644 --- a/OpenChange/MAPIStoreFolder.m +++ b/OpenChange/MAPIStoreFolder.m @@ -1141,7 +1141,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe access |= 0x02; if (userIsOwner || [self subscriberCanDeleteMessages]) access |= 0x04; - if (userIsOwner || [self subscriberCanCreateSubFolders]) + if ((userIsOwner || [self subscriberCanCreateSubFolders]) + && [self supportsSubFolders]) access |= 0x08; if (userIsOwner || [self subscriberCanCreateMessages]) access |= 0x10; @@ -1595,4 +1596,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe return NO; } +- (BOOL) supportsSubFolders +{ + return NO; +} + @end diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m index 5df5bf0ef..57fc1b348 100644 --- a/OpenChange/MAPIStoreMailFolder.m +++ b/OpenChange/MAPIStoreMailFolder.m @@ -1179,6 +1179,11 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP) return childFolder; } +- (BOOL) supportsSubFolders +{ + return !usesAltNameSpace; +} + @end @implementation MAPIStoreSentItemsFolder : MAPIStoreMailFolder From e942cb8b52422306ae3bf6cf2593a157166f1cf9 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Jan 2012 19:56:36 +0000 Subject: [PATCH 3/5] Monotone-Parent: bc440bc0c22c32437dc043e9566760ddd30fea67 Monotone-Revision: a42e52e628a2724b097b0a8aed05b39e75f6a528 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-01-26T19:56:36 Monotone-Branch: ca.inverse.sogo --- OpenChange/MAPIStoreFolder.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h index 9bd9491b0..285c2bba3 100644 --- a/OpenChange/MAPIStoreFolder.h +++ b/OpenChange/MAPIStoreFolder.h @@ -165,6 +165,8 @@ - (BOOL) subscriberCanDeleteMessages; - (BOOL) subscriberCanCreateSubFolders; +- (BOOL) supportsSubFolders; /* capability */ + /* subclass helpers */ - (void) postNotificationsForMoveCopyMessagesWithMIDs: (uint64_t *) srcMids andMessageURLs: (NSArray *) oldMessageURLs From 996b6ae8177dc4cc343aff533068f003892ce22e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Jan 2012 19:56:56 +0000 Subject: [PATCH 4/5] Monotone-Parent: a42e52e628a2724b097b0a8aed05b39e75f6a528 Monotone-Revision: 74ae59fc584e99eb514b2c1e615eb58cf0a162db Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-01-26T19:56:56 Monotone-Branch: ca.inverse.sogo --- OpenChange/MAPIStoreFallbackContext.m | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m index e48b63802..8368671e3 100644 --- a/OpenChange/MAPIStoreFallbackContext.m +++ b/OpenChange/MAPIStoreFallbackContext.m @@ -26,6 +26,9 @@ #import "MAPIStoreFallbackContext.h" +#undef DEBUG +#include + @implementation MAPIStoreFallbackContext + (NSString *) MAPIModuleName @@ -33,6 +36,23 @@ return @"fallback"; } ++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName + inMemCtx: (TALLOC_CTX *) memCtx +{ + struct mapistore_contexts_list *context; + + context = talloc_zero(memCtx, struct mapistore_contexts_list); + context->url = talloc_asprintf (context, "sogo://%s@fallback/", + [userName UTF8String]); + context->name = "Fallback"; + context->main_folder = true; + context->role = MAPISTORE_FALLBACK_ROLE; + context->tag = "tag"; + context->prev = context; + + return context; +} + - (void) setupBaseFolder: (NSURL *) newURL { baseFolder = [MAPIStoreFSFolder baseFolderWithURL: newURL inContext: self]; From 3f4197f2fab1d34e867226f0cc8263143f78febd Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Jan 2012 19:57:17 +0000 Subject: [PATCH 5/5] Monotone-Parent: 74ae59fc584e99eb514b2c1e615eb58cf0a162db Monotone-Revision: 881d0e4a9a9117f8671dd4758b691044c07a1247 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-01-26T19:57:17 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 11 ++++++ OpenChange/GNUmakefile | 10 ----- OpenChange/MAPIStoreCommonViewsContext.h | 32 ---------------- OpenChange/MAPIStoreCommonViewsContext.m | 34 ----------------- OpenChange/MAPIStoreDeferredActionsContext.h | 32 ---------------- OpenChange/MAPIStoreDeferredActionsContext.m | 36 ------------------ OpenChange/MAPIStoreFreebusyContext.h | 32 ---------------- OpenChange/MAPIStoreFreebusyContext.m | 40 -------------------- OpenChange/MAPIStoreJournalContext.h | 32 ---------------- OpenChange/MAPIStoreJournalContext.m | 36 ------------------ OpenChange/MAPIStoreRemindersContext.h | 32 ---------------- OpenChange/MAPIStoreRemindersContext.m | 36 ------------------ OpenChange/MAPIStoreScheduleContext.h | 32 ---------------- OpenChange/MAPIStoreScheduleContext.m | 36 ------------------ OpenChange/MAPIStoreSearchContext.h | 32 ---------------- OpenChange/MAPIStoreSearchContext.m | 36 ------------------ OpenChange/MAPIStoreShortcutsContext.h | 32 ---------------- OpenChange/MAPIStoreShortcutsContext.m | 36 ------------------ OpenChange/MAPIStoreSpoolerContext.h | 32 ---------------- OpenChange/MAPIStoreSpoolerContext.m | 34 ----------------- OpenChange/MAPIStoreViewsContext.h | 32 ---------------- OpenChange/MAPIStoreViewsContext.m | 36 ------------------ 22 files changed, 11 insertions(+), 690 deletions(-) delete mode 100644 OpenChange/MAPIStoreCommonViewsContext.h delete mode 100644 OpenChange/MAPIStoreCommonViewsContext.m delete mode 100644 OpenChange/MAPIStoreDeferredActionsContext.h delete mode 100644 OpenChange/MAPIStoreDeferredActionsContext.m delete mode 100644 OpenChange/MAPIStoreFreebusyContext.h delete mode 100644 OpenChange/MAPIStoreFreebusyContext.m delete mode 100644 OpenChange/MAPIStoreJournalContext.h delete mode 100644 OpenChange/MAPIStoreJournalContext.m delete mode 100644 OpenChange/MAPIStoreRemindersContext.h delete mode 100644 OpenChange/MAPIStoreRemindersContext.m delete mode 100644 OpenChange/MAPIStoreScheduleContext.h delete mode 100644 OpenChange/MAPIStoreScheduleContext.m delete mode 100644 OpenChange/MAPIStoreSearchContext.h delete mode 100644 OpenChange/MAPIStoreSearchContext.m delete mode 100644 OpenChange/MAPIStoreShortcutsContext.h delete mode 100644 OpenChange/MAPIStoreShortcutsContext.m delete mode 100644 OpenChange/MAPIStoreSpoolerContext.h delete mode 100644 OpenChange/MAPIStoreSpoolerContext.m delete mode 100644 OpenChange/MAPIStoreViewsContext.h delete mode 100644 OpenChange/MAPIStoreViewsContext.m diff --git a/ChangeLog b/ChangeLog index 01919d3e1..17c99fd43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2012-01-26 Wolfgang Sourdeau + * OpenChange/MAPIStoreCommonViewsContext.[hm], + OpenChange/MAPIStoreDeferredActionsContext.[hm], + OpenChange/MAPIStoreFreebusyContext.[hm], + OpenChange/MAPIStoreJournalContext.[hm], + OpenChange/MAPIStoreRemindersContext.[hm], + OpenChange/MAPIStoreScheduleContext.[hm], + OpenChange/MAPIStoreSearchContext.[hm], + OpenChange/MAPIStoreShortcutsContext.[hm], + OpenChange/MAPIStoreSpoolerContext.[hm], + OpenChange/MAPIStoreViewsContext.[hm]: deleted obsolete classes. + * OpenChange/MAPIStoreFolder.m (supportsSubFolders): new overridable method that returns whether the current folder can contain subfolders, nowithstanding the right of the current user diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile index a28abc6d3..822c137e9 100644 --- a/OpenChange/GNUmakefile +++ b/OpenChange/GNUmakefile @@ -102,17 +102,7 @@ $(SOGOBACKEND)_OBJC_FILES += \ MAPIStoreNotesFolder.m \ MAPIStoreNotesMessage.m \ \ - MAPIStoreCommonViewsContext.m \ - MAPIStoreDeferredActionsContext.m \ MAPIStoreFallbackContext.m \ - MAPIStoreFreebusyContext.m \ - MAPIStoreJournalContext.m \ - MAPIStoreRemindersContext.m \ - MAPIStoreScheduleContext.m \ - MAPIStoreSearchContext.m \ - MAPIStoreShortcutsContext.m \ - MAPIStoreSpoolerContext.m \ - MAPIStoreViewsContext.m \ \ NSArray+MAPIStore.m \ NSData+MAPIStore.m \ diff --git a/OpenChange/MAPIStoreCommonViewsContext.h b/OpenChange/MAPIStoreCommonViewsContext.h deleted file mode 100644 index 45dc82085..000000000 --- a/OpenChange/MAPIStoreCommonViewsContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreCommonViewsContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTORECOMMONVIEWSCONTEXT_H -#define MAPISTORECOMMONVIEWSCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreCommonViewsContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTORECOMMONVIEWSCONTEXT_H */ diff --git a/OpenChange/MAPIStoreCommonViewsContext.m b/OpenChange/MAPIStoreCommonViewsContext.m deleted file mode 100644 index 210cbead7..000000000 --- a/OpenChange/MAPIStoreCommonViewsContext.m +++ /dev/null @@ -1,34 +0,0 @@ -/* MAPIStoreCommonViewsContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreCommonViewsContext.h" - -@implementation MAPIStoreCommonViewsContext - -+ (NSString *) MAPIModuleName -{ - return @"common-views"; -} - -@end diff --git a/OpenChange/MAPIStoreDeferredActionsContext.h b/OpenChange/MAPIStoreDeferredActionsContext.h deleted file mode 100644 index e4686b039..000000000 --- a/OpenChange/MAPIStoreDeferredActionsContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreDeferredActionsContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTOREDEFERREDACTIONSCONTEXT_H -#define MAPISTOREDEFERREDACTIONSCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreDeferredActionsContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTOREDEFERREDACTIONSCONTEXT_H */ diff --git a/OpenChange/MAPIStoreDeferredActionsContext.m b/OpenChange/MAPIStoreDeferredActionsContext.m deleted file mode 100644 index 02bd8699b..000000000 --- a/OpenChange/MAPIStoreDeferredActionsContext.m +++ /dev/null @@ -1,36 +0,0 @@ -/* MAPIStoreDeferredActionsContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreMapping.h" - -#import "MAPIStoreDeferredActionsContext.h" - -@implementation MAPIStoreDeferredActionsContext - -+ (NSString *) MAPIModuleName -{ - return @"deferred-actions"; -} - -@end diff --git a/OpenChange/MAPIStoreFreebusyContext.h b/OpenChange/MAPIStoreFreebusyContext.h deleted file mode 100644 index 22ce8e9f3..000000000 --- a/OpenChange/MAPIStoreFreebusyContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreFreebusyContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTOREFREEBUSYCONTEXT_H -#define MAPISTOREFREEBUSYCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreFreebusyContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTOREFREEBUSYCONTEXT_H */ diff --git a/OpenChange/MAPIStoreFreebusyContext.m b/OpenChange/MAPIStoreFreebusyContext.m deleted file mode 100644 index ea506e5fc..000000000 --- a/OpenChange/MAPIStoreFreebusyContext.m +++ /dev/null @@ -1,40 +0,0 @@ -/* MAPIStoreFreebusyContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import - -#import "MAPIApplication.h" -#import "MAPIStoreAuthenticator.h" -#import "MAPIStoreMapping.h" - -#import "MAPIStoreFreebusyContext.h" - -@implementation MAPIStoreFreebusyContext - -+ (NSString *) MAPIModuleName -{ - return @"freebusy"; -} - -@end diff --git a/OpenChange/MAPIStoreJournalContext.h b/OpenChange/MAPIStoreJournalContext.h deleted file mode 100644 index b18c1fcfc..000000000 --- a/OpenChange/MAPIStoreJournalContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreJournalContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTOREJOURNALCONTEXT_H -#define MAPISTOREJOURNALCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreJournalContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTOREJOURNALCONTEXT_H */ diff --git a/OpenChange/MAPIStoreJournalContext.m b/OpenChange/MAPIStoreJournalContext.m deleted file mode 100644 index 309fd56d2..000000000 --- a/OpenChange/MAPIStoreJournalContext.m +++ /dev/null @@ -1,36 +0,0 @@ -/* MAPIStoreJournalContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreMapping.h" - -#import "MAPIStoreJournalContext.h" - -@implementation MAPIStoreJournalContext - -+ (NSString *) MAPIModuleName -{ - return @"journal"; -} - -@end diff --git a/OpenChange/MAPIStoreRemindersContext.h b/OpenChange/MAPIStoreRemindersContext.h deleted file mode 100644 index 337635110..000000000 --- a/OpenChange/MAPIStoreRemindersContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreRemindersContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTOREREMINDERSCONTEXT_H -#define MAPISTOREREMINDERSCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreRemindersContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTOREREMINDERSCONTEXT_H */ diff --git a/OpenChange/MAPIStoreRemindersContext.m b/OpenChange/MAPIStoreRemindersContext.m deleted file mode 100644 index 262633ed5..000000000 --- a/OpenChange/MAPIStoreRemindersContext.m +++ /dev/null @@ -1,36 +0,0 @@ -/* MAPIStoreRemindersContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreMapping.h" - -#import "MAPIStoreRemindersContext.h" - -@implementation MAPIStoreRemindersContext - -+ (NSString *) MAPIModuleName -{ - return @"reminders"; -} - -@end diff --git a/OpenChange/MAPIStoreScheduleContext.h b/OpenChange/MAPIStoreScheduleContext.h deleted file mode 100644 index 473299891..000000000 --- a/OpenChange/MAPIStoreScheduleContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreScheduleContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTORESCHEDULECONTEXT_H -#define MAPISTORESCHEDULECONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreScheduleContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTORESCHEDULECONTEXT_H */ diff --git a/OpenChange/MAPIStoreScheduleContext.m b/OpenChange/MAPIStoreScheduleContext.m deleted file mode 100644 index 4b0af83d6..000000000 --- a/OpenChange/MAPIStoreScheduleContext.m +++ /dev/null @@ -1,36 +0,0 @@ -/* MAPIStoreScheduleContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreMapping.h" - -#import "MAPIStoreScheduleContext.h" - -@implementation MAPIStoreScheduleContext - -+ (NSString *) MAPIModuleName -{ - return @"schedule"; -} - -@end diff --git a/OpenChange/MAPIStoreSearchContext.h b/OpenChange/MAPIStoreSearchContext.h deleted file mode 100644 index c8aee3613..000000000 --- a/OpenChange/MAPIStoreSearchContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreSearchContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTORESEARCHCONTEXT_H -#define MAPISTORESEARCHCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreSearchContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTORESEARCHCONTEXT_H */ diff --git a/OpenChange/MAPIStoreSearchContext.m b/OpenChange/MAPIStoreSearchContext.m deleted file mode 100644 index 3820eb22e..000000000 --- a/OpenChange/MAPIStoreSearchContext.m +++ /dev/null @@ -1,36 +0,0 @@ -/* MAPIStoreSearchContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreMapping.h" - -#import "MAPIStoreSearchContext.h" - -@implementation MAPIStoreSearchContext - -+ (NSString *) MAPIModuleName -{ - return @"search"; -} - -@end diff --git a/OpenChange/MAPIStoreShortcutsContext.h b/OpenChange/MAPIStoreShortcutsContext.h deleted file mode 100644 index 280f84367..000000000 --- a/OpenChange/MAPIStoreShortcutsContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreShortcutsContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTORESHORTCUTSCONTEXT_H -#define MAPISTORESHORTCUTSCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreShortcutsContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTORESHORTCUTSCONTEXT_H */ diff --git a/OpenChange/MAPIStoreShortcutsContext.m b/OpenChange/MAPIStoreShortcutsContext.m deleted file mode 100644 index 66a7aa1ce..000000000 --- a/OpenChange/MAPIStoreShortcutsContext.m +++ /dev/null @@ -1,36 +0,0 @@ -/* MAPIStoreShortcutsContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreMapping.h" - -#import "MAPIStoreShortcutsContext.h" - -@implementation MAPIStoreShortcutsContext - -+ (NSString *) MAPIModuleName -{ - return @"shortcuts"; -} - -@end diff --git a/OpenChange/MAPIStoreSpoolerContext.h b/OpenChange/MAPIStoreSpoolerContext.h deleted file mode 100644 index 466f2c063..000000000 --- a/OpenChange/MAPIStoreSpoolerContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreSpoolerContext.h - this file is part of SOGo - * - * Copyright (C) 2011 Inverse inc - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTORESPOOLERCONTEXT_H -#define MAPISTORESPOOLERCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreSpoolerContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTORESPOOLERCONTEXT_H */ diff --git a/OpenChange/MAPIStoreSpoolerContext.m b/OpenChange/MAPIStoreSpoolerContext.m deleted file mode 100644 index 92d531ca8..000000000 --- a/OpenChange/MAPIStoreSpoolerContext.m +++ /dev/null @@ -1,34 +0,0 @@ -/* MAPIStoreSpoolerContext.m - this file is part of SOGo - * - * Copyright (C) 2011 Inverse inc - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreSpoolerContext.h" - -@implementation MAPIStoreSpoolerContext - -+ (NSString *) MAPIModuleName -{ - return @"spooler-queue"; -} - -@end diff --git a/OpenChange/MAPIStoreViewsContext.h b/OpenChange/MAPIStoreViewsContext.h deleted file mode 100644 index 7f6d31783..000000000 --- a/OpenChange/MAPIStoreViewsContext.h +++ /dev/null @@ -1,32 +0,0 @@ -/* MAPIStoreViewsContext.h - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MAPISTOREVIEWSCONTEXT_H -#define MAPISTOREVIEWSCONTEXT_H - -#import "MAPIStoreFSBaseContext.h" - -@interface MAPIStoreViewsContext : MAPIStoreFSBaseContext - -@end - -#endif /* MAPISTOREVIEWSCONTEXT_H */ diff --git a/OpenChange/MAPIStoreViewsContext.m b/OpenChange/MAPIStoreViewsContext.m deleted file mode 100644 index a5a9a9940..000000000 --- a/OpenChange/MAPIStoreViewsContext.m +++ /dev/null @@ -1,36 +0,0 @@ -/* MAPIStoreViewsContext.m - this file is part of SOGo - * - * Copyright (C) 2010 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import - -#import "MAPIStoreMapping.h" - -#import "MAPIStoreViewsContext.h" - -@implementation MAPIStoreViewsContext - -+ (NSString *) MAPIModuleName -{ - return @"views"; -} - -@end