merge of '2383d3cfedbdc621439fd847ceb4bddeed43c93e'
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:
commit
cb18bab0c6
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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];
|
||||
}
|
||||
}
|
||||
|
||||
- (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;
|
||||
|
|
|
@ -29,13 +29,6 @@
|
|||
|
||||
@implementation UIxRecurrenceEditor
|
||||
|
||||
- (id) defaultAction
|
||||
{
|
||||
[[self parent] setToolbar: @""];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSArray *) monthlyRepeatList
|
||||
{
|
||||
static NSArray *monthlyRepeatList = nil;
|
||||
|
|
Loading…
Reference in a new issue