amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-23 05:49:31 +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

20
ChangeLog
View File

@@ -10,6 +10,12 @@
(-_toolbarForOwner:andClientObject:): no toolbar should appear
when dealing with web calendars.
2009-10-14 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/Scheduler/UIxCalMainActions.m
We store the string value of the URL in our
prefs, not the NSURL instance.
2009-10-13 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/NSDictionary+BSJSONAdditions.m
@@ -41,6 +47,20 @@
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.
* UI/MailPartViewers/UIxMailPartICalActions.m (-delegateAction):
delegatedAttendee is autoreleased to avoid a leak.
* SoObjects/SOGo/LDAPSource.m (-dealloc): we release the
"searchAttributes" ivar, even though LDAPSource instances are
never deallocated.

2
UI/MailPartViewers/UIxMailPartICalActions.m
View File

@@ -264,6 +264,7 @@
{
user = [context activeUser];
delegatedAttendee = [iCalPerson new];
[delegatedAttendee autorelease];
[delegatedAttendee setEmail: delegatedEmail];
delegatedUid = [delegatedAttendee uid];
if (delegatedUid)
@@ -272,7 +273,6 @@
delegatedUser = [SOGoUser userWithLogin: delegatedUid];
[delegatedAttendee setCn: [delegatedUser cn]];
}
[delegatedAttendee setRole: @"REQ-PARTICIPANT"];
[delegatedAttendee setRsvp: @"TRUE"];
[delegatedAttendee setParticipationStatus: iCalPersonPartStatNeedsAction];

3
UI/MainUI/SOGoUserHomePage.m
View File

@@ -323,7 +323,7 @@ static NSString *LDAPContactInfoAttribute = nil;
[response setHeader: @"text/plain; charset=utf-8"
forKey: @"Content-Type"];
responseString = [NSMutableString new];
responseString = [NSMutableString string];
// We sort our array - this is pretty useful for the Web
// interface of SOGo.
@@ -353,7 +353,6 @@ static NSString *LDAPContactInfoAttribute = nil;
}
}
[response appendContentString: responseString];
[responseString release];
return response;
}

15
UI/PreferencesUI/UIxPreferences.m
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
@@ -1044,7 +1044,6 @@ static BOOL forwardEnabled = NO;
[userDefaults setObject: [plist objectAtIndex: 1]
forKey: @"CalendarCategoriesColors"];
}
}
- (NSArray *) languages

3
UI/SOGoUI/SOGoAptFormatter.m
View File

@@ -240,8 +240,7 @@
NSCalendarDate *startDate;
NSTimeZone *dtz;
title = [NSMutableString new];
[title autorelease];
title = [NSMutableString string];
dtz = [self displayTZ];
startDate = [_apt valueForKey: @"startDate"];

1
UI/Scheduler/UIxAppointmentEditor.m
View File

@@ -547,6 +547,7 @@
{
user = [context activeUser];
delegatedAttendee = [iCalPerson new];
[delegatedAttendee autorelease];
[delegatedAttendee setEmail: delegatedEmail];
delegatedUid = [delegatedAttendee uid];
if (delegatedUid)

2
UI/Scheduler/UIxCalMainActions.m
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];
}

3
UI/Scheduler/UIxComponentEditor.m
View File

@@ -550,7 +550,8 @@ iRANGE(2);
ASSIGN (organizer, [component organizer]);
[self _loadCategories];
[self _loadAttendees];
if (!jsonAttendees)
[self _loadAttendees];
[self _loadRRules];
[self _loadAlarms];

8
UI/Scheduler/UIxTimeDateControl.m
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]];