LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge of '2383d3cfedbdc621439fd847ceb4bddeed43c93e'

Browse source 
and 'cae6414bdec9c9720651a6d880165e55830fd06d'

Monotone-Parent: 2383d3cfedbdc621439fd847ceb4bddeed43c93e
Monotone-Parent: cae6414bdec9c9720651a6d880165e55830fd06d
Monotone-Revision: 343adae0f9aaa38141d7e8ecb879168e50fff1bf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-24T20:10:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2009-03-24 20:10:52 +00:00
parent 91fb95c461 912181b3e5
commit cb18bab0c6
4 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-24 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxCalMainView.m: if the module settings key
exists, do not reset it.
2009-03-24 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/MailerUI/UIxMailListView.m

2
SoObjects/SOGo/SOGoObject.m
View file

@ -561,8 +561,8 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
[self _davPrivilegesFromRoles: roles]);
[currentAce addObject: currentGrant];
[aces addObject: davElementWithContent (@"ace", @"DAV:", currentAce)];
[currentAce release];
}
[currentAce release];
}
- (void) _fillAcesWithRolesForPseudoPrincipals: (NSMutableArray *) aces

17
UI/Scheduler/UIxCalMainView.m
View file

@ -40,9 +40,6 @@
#import <Appointments/SOGoAppointmentFolder.h>
static NSMutableArray *monthMenuItems = nil;
static NSMutableArray *yearMenuItems = nil;
@implementation UIxCalMainView
- (void) _setupContext
@ -60,24 +57,22 @@ static NSMutableArray *yearMenuItems = nil;
moduleSettings = [ud objectForKey: module];
if (!moduleSettings)
{
moduleSettings = [NSMutableDictionary new];
[moduleSettings autorelease];
moduleSettings = [NSMutableDictionary dictionary];
[ud setObject: moduleSettings forKey: module];
}
[ud setObject: moduleSettings forKey: module];
}
- (NSArray *) monthMenuItems
{
static NSMutableArray *monthMenuItems = nil;
unsigned int count;
if (!monthMenuItems)
{
monthMenuItems = [NSMutableArray arrayWithCapacity: 12];
monthMenuItems = [[NSMutableArray alloc] initWithCapacity: 12];
for (count = 1; count < 13; count++)
[monthMenuItems addObject:
[NSString stringWithFormat: @"%.2d", count]];
[monthMenuItems retain];
}
return monthMenuItems;
@ -100,15 +95,15 @@ static NSMutableArray *yearMenuItems = nil;
- (NSArray *) yearMenuItems
{
static NSMutableArray *yearMenuItems = nil;
int count, year;
if (!yearMenuItems)
{
year = [[NSCalendarDate date] yearOfCommonEra];
yearMenuItems = [NSMutableArray arrayWithCapacity: 11];
yearMenuItems = [[NSMutableArray alloc] initWithCapacity: 11];
for (count = -5; count < 6; count++)
[yearMenuItems addObject: [NSNumber numberWithInt: year + count]];
[yearMenuItems retain];
}
return yearMenuItems;

9
UI/Scheduler/UIxRecurrenceEditor.m
View file

@ -29,13 +29,6 @@
@implementation UIxRecurrenceEditor
- (id) defaultAction
{
[[self parent] setToolbar: @""];
return self;
}
- (NSArray *) monthlyRepeatList
{
static NSArray *monthlyRepeatList = nil;
@ -43,7 +36,7 @@
if (!monthlyRepeatList)
{
monthlyRepeatList = [NSArray arrayWithObjects: @"First", @"Second", @"Third",
@"Fourth", @"Fift", @"Last", nil];
@"Fourth", @"Fift", @"Last", nil];
[monthlyRepeatList retain];
}