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

merge of '2b398c7917c2665525f315c4a078f13665aeea62'

Browse Source 
and '9808a0781250c62da6dbd16dbd959fef199ace09'

Monotone-Parent: 2b398c7917c2665525f315c4a078f13665aeea62
Monotone-Parent: 9808a0781250c62da6dbd16dbd959fef199ace09
Monotone-Revision: 9718b3ccbc149f9b4b497423af72e8271ec7b624

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-14T19:27:54
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-14 19:27:54 +00:00
parent 5396c23a62 b6d3139fb7
commit ec67e4d654
9 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/UIxAppointmentEditor.m
+1
View File
@@ -547,6 +547,7 @@
{
user = [context activeUser];
delegatedAttendee = [iCalPerson new];
[delegatedAttendee autorelease];
[delegatedAttendee setEmail: delegatedEmail];
delegatedUid = [delegatedAttendee uid];
if (delegatedUid)
UI/Scheduler/UIxCalMainActions.m
+1 -1
View File
@@ -118,7 +118,7 @@
webCalendars = [NSMutableDictionary dictionary];
[calSettings setObject: webCalendars forKey: @"WebCalendars"];
}
[webCalendars setObject: calendarURL forKey: calendarName];
[webCalendars setObject: [calendarURL absoluteString] forKey: calendarName];
[settings synchronize];
}
UI/Scheduler/UIxComponentEditor.m
+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];
UI/Scheduler/UIxTimeDateControl.m
+2 -6
View File
@@ -176,9 +176,7 @@
NSMutableArray *hours;
unsigned int h;
hours = [NSMutableArray new];
[hours autorelease];
hours = [NSMutableArray array];
for (h = startHour; h < (endHour + 1); h++)
[hours addObject: [NSNumber numberWithInt: h]];
@@ -210,9 +208,7 @@
NSMutableArray *minutes;
unsigned int m;
minutes = [NSMutableArray new];
[minutes autorelease];
minutes = [NSMutableArray array];
for (m = 0; m < 60; m += 15)
[minutes addObject: [NSNumber numberWithInt: m]];