Monotone-Parent: bcf0244d358523a4f4d16339d9ea38d4ce1114e2

Monotone-Revision: b246c3979cba84d0c46cb39e0141ae390baaea7a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-14T12:01:59
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2009-10-14 12:01:59 +00:00
1 parent 4a3f7e384f
commit e5d8de7d5c
3 files changed
+17 -9

No files matched your search

+8
View File
@@ -1,5 +1,13 @@
2009-10-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxComponentEditor.m (-setComponent:): we invoke
_loadAttendee only when "jsonAttendees" is not set, even though
that condition should always be true.
* UI/PreferencesUI/UIxPreferences.m (-setCategoriesValue): we use
[self errorWithFormat:] rather than NSLog to output
deserialization errors.
* UI/Scheduler/UIxAppointmentEditor.m (-delegateAction): same as
below.
+7 -8
View File
@@ -30,6 +30,8 @@
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WORequest.h>
#import <NGExtensions/NSObject+Logs.h>
#import <SoObjects/SOGo/NSArray+Utilities.h>
#import <SoObjects/SOGo/NSDictionary+Utilities.h>
#import <SoObjects/SOGo/NSString+Utilities.h>
@@ -369,8 +371,7 @@ static BOOL forwardEnabled = NO;
NSMutableArray *daysList;
unsigned int currentDay;
daysList = [NSMutableArray new];
[daysList autorelease];
daysList = [NSMutableArray array];
for (currentDay = 0; currentDay < 7; currentDay++)
[daysList addObject: [NSString stringWithFormat: @"%d", currentDay]];
@@ -751,8 +752,7 @@ static BOOL forwardEnabled = NO;
addressesList = [vacationOptions objectForKey: @"autoReplyEmailAddresses"];
if (!addressesList)
{
newAddressesList = [NSMutableArray new];
[newAddressesList autorelease];
newAddressesList = [NSMutableArray array];
addressesList = [NSMutableArray arrayWithArray: [user allEmails]];
for (i = 0; i < [addressesList count]; i++)
{
@@ -1031,10 +1031,10 @@ static BOOL forwardEnabled = NO;
mutabilityOption: NSPropertyListImmutable
format: &format
errorDescription: &error];
if(!plist)
if (!plist)
{
NSLog(error);
[self errorWithFormat: @"an error occured during deserialization"
@" of categories: %@", error];
[error release];
}
else
@@ -1045,7 +1045,6 @@ static BOOL forwardEnabled = NO;
forKey: @"CalendarCategoriesColors"];
NSLog ([plist description]);
}
}
- (NSArray *) languages
+2 -1
View File
@@ -550,7 +550,8 @@ iRANGE(2);
ASSIGN (organizer, [component organizer]);
[self _loadCategories];
[self _loadAttendees];
if (!jsonAttendees)
[self _loadAttendees];
[self _loadRRules];
[self _loadAlarms];