mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-04-10 07:48:52 +00:00
Monotone-Parent: 1262e2fcc08f58c9a8f748c7659f594f3b34b83e
Monotone-Revision: 704388dc317a828141a6fffd102a20fc8104ee91 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-11-18T22:26:40 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
2010-11-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* OpenChange/MAPIApplication.m (-init): most of the setup code has
|
||||
been moved into MAPIStoreSOGo.m.
|
||||
|
||||
* OpenChange/GNUmakefile: the MAPIStoreSOGo library is now just a
|
||||
wrapper that loads the new "SOGoBackend" bundle from
|
||||
SoProductRegistry.
|
||||
|
||||
@@ -45,33 +45,8 @@ MAPIApplication *MAPIApp = nil;
|
||||
|
||||
- (id) init
|
||||
{
|
||||
SOGoProductLoader *loader;
|
||||
NSUserDefaults *ud;
|
||||
SOGoSystemDefaults *sd;
|
||||
|
||||
if (!MAPIApp)
|
||||
{
|
||||
/* Here we work around a bug in GNUstep which decodes XML user
|
||||
defaults using the system encoding rather than honouring
|
||||
the encoding specified in the file. */
|
||||
putenv ("GNUSTEP_STRING_ENCODING=NSUTF8StringEncoding");
|
||||
|
||||
sd = [SOGoSystemDefaults sharedSystemDefaults];
|
||||
|
||||
// /* We force the plugin to base its configuration on the SOGo tree. */
|
||||
ud = [NSUserDefaults standardUserDefaults];
|
||||
[ud registerDefaults: [ud persistentDomainForName: @"sogod"]];
|
||||
|
||||
NSLog (@"(config check) imap server: %@", [sd imapServer]);
|
||||
|
||||
// TODO publish
|
||||
loader = [SOGoProductLoader productLoader];
|
||||
[loader loadProducts: [NSArray arrayWithObjects:
|
||||
@"Contacts.SOGo",
|
||||
@"Appointments.SOGo",
|
||||
@"Mailer.SOGo",
|
||||
nil]];
|
||||
|
||||
// TODO publish
|
||||
[iCalEntityObject initializeSOGoExtensions];
|
||||
|
||||
@@ -80,7 +55,7 @@ MAPIApplication *MAPIApp = nil;
|
||||
|
||||
/* This is a hack to revert what is done in [WOCoreApplication
|
||||
init] */
|
||||
[[NSClassFromString(@"UnixSignalHandler") sharedHandler]
|
||||
[[NSClassFromString (@"UnixSignalHandler") sharedHandler]
|
||||
removeObserver: self];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user