mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-12 07:17:12 +00:00
merge of 'c8d084db03459d614e6031f3b3996696f8a588b4'
and 'e3d03c71b23436eb1ba6f15cfccc6c59a06df891' Monotone-Parent: c8d084db03459d614e6031f3b3996696f8a588b4 Monotone-Parent: e3d03c71b23436eb1ba6f15cfccc6c59a06df891 Monotone-Revision: b1078ea4dae02277bdf66ea5ad2e7fcdb26dc259 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-12-15T22:28:32 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
4a43370a91
12 files changed
+65
-98
No files matched your search
@@ -127,7 +127,7 @@ static Class sogoAppointmentFolderKlass = Nil;
|
||||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
static SOGoWebDAVAclManager *aclManager = nil;
|
||||
NSString *nsI;
|
||||
|
||||
if (!aclManager)
|
||||
@@ -1071,7 +1071,6 @@ static Class sogoAppointmentFolderKlass = Nil;
|
||||
NSString **values, **currentValue;
|
||||
SoSecurityManager *mgr;
|
||||
SEL methodSel;
|
||||
Class c;
|
||||
|
||||
#warning things may crash here...
|
||||
values = calloc (100, sizeof (NSMutableString *));
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
static SOGoWebDAVAclManager *aclManager = nil;
|
||||
NSString *nsD, *nsI;
|
||||
|
||||
if (!aclManager)
|
||||
|
||||
@@ -58,12 +58,14 @@ static NSLock *lock;
|
||||
|
||||
@implementation SOGoCache
|
||||
|
||||
#if defined(THREADSAFE)
|
||||
+ (void) initialize
|
||||
{
|
||||
#if defined(THREADSAFE)
|
||||
lock = [NSLock new];
|
||||
}
|
||||
#endif
|
||||
s_userDefaults = [[NSMutableDictionary alloc] init];
|
||||
s_userSettings = [[NSMutableDictionary alloc] init];
|
||||
}
|
||||
|
||||
+ (NSTimeInterval) cleanupInterval
|
||||
{
|
||||
@@ -105,9 +107,6 @@ static NSLock *lock;
|
||||
cache = [[NSMutableDictionary alloc] init];
|
||||
users = [[NSMutableDictionary alloc] init];
|
||||
|
||||
s_userDefaults = [[NSMutableDictionary alloc] init];
|
||||
s_userSettings = [[NSMutableDictionary alloc] init];
|
||||
|
||||
// We register ourself for notifications
|
||||
[[NSDistributedNotificationCenter defaultCenter]
|
||||
addObserver: self
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *webdavAclManager = nil;
|
||||
static SOGoWebDAVAclManager *webdavAclManager = nil;
|
||||
|
||||
if (!webdavAclManager)
|
||||
{
|
||||
|
||||
@@ -73,7 +73,7 @@ static NSArray *childRecordFields = nil;
|
||||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
static SOGoWebDAVAclManager *aclManager = nil;
|
||||
|
||||
if (!aclManager)
|
||||
{
|
||||
|
||||
@@ -54,7 +54,7 @@ static SoSecurityManager *sm = nil;
|
||||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
static SOGoWebDAVAclManager *aclManager = nil;
|
||||
|
||||
if (!aclManager)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user