amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-11 09:51:23 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 7f4eeefacdaca8eff90c7eebfb960933cd076c8f

Browse Source 
Monotone-Revision: d28c051b2f83062ff54891a804d548e9ca666837

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-26T18:25:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-10-26 18:25:32 +00:00
parent db5389e589
commit d441ff54cb
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2010-10-26 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserDefaults.m (-{set}ContactsCategories):
renamed version of the "contactCategories" accessors.
* SoObjects/SOGo/NSString+Utilities.m (-objectFromJSONString): new
method replacing the one below in a more generic way. I.e. the
method will accept any JSON object as input and not only

10
SoObjects/Contacts/SOGoContactFolders.m
View File

@@ -111,7 +111,7 @@
return keys;
}
- (NSException *) setDavContactCategories: (NSString *) newCategories
- (NSException *) setDavContactsCategories: (NSString *) newCategories
{
SOGoUser *ownerUser;
NSMutableArray *categories;
@@ -143,13 +143,13 @@
NSLog (@"setting categories to : %@", categories);
ownerUser = [SOGoUser userWithLogin: owner];
ud = [ownerUser userDefaults];
[ud setContactCategories: categories];
[ud setContactsCategories: categories];
[ud synchronize];
return nil;
}
- (SOGoWebDAVValue *) davContactCategories
- (SOGoWebDAVValue *) davContactsCategories
{
NSMutableArray *davCategories;
NSArray *categories;
@@ -158,7 +158,7 @@
NSDictionary *catElement;
ownerUser = [SOGoUser userWithLogin: owner];
categories = [[ownerUser userDefaults] contactCategories];
categories = [[ownerUser userDefaults] contactsCategories];
max = [categories count];
davCategories = [NSMutableArray arrayWithCapacity: max];
@@ -170,7 +170,7 @@
[davCategories addObject: catElement];
}
return [davElementWithContent (@"contact-categories",
return [davElementWithContent (@"contacts-categories",
XMLNS_INVERSEDAV,
davCategories)
asWebDAVValue];

4
SoObjects/SOGo/SOGoUserDefaults.h
View File

@@ -165,8 +165,8 @@ extern NSString *SOGoWeekStartFirstFullWeek;
- (BOOL) remindWithASound;
/* contacts */
- (void) setContactCategories: (NSArray *) newValues;
- (NSArray *) contactCategories;
- (void) setContactsCategories: (NSArray *) newValues;
- (NSArray *) contactsCategories;
@end

8
SoObjects/SOGo/SOGoUserDefaults.m
View File

@@ -651,14 +651,14 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
return [self dictionaryForKey: @"Forward"];
}
- (void) setContactCategories: (NSArray *) newValues
- (void) setContactsCategories: (NSArray *) newValues
{
[self setObject: newValues forKey: @"SOGoContactCategories"];
[self setObject: newValues forKey: @"SOGoContactsCategories"];
}
- (NSArray *) contactCategories
- (NSArray *) contactsCategories
{
return [self stringArrayForKey: @"SOGoContactCategories"];
return [self stringArrayForKey: @"SOGoContactsCategories"];
}
@end