amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-29 23:25:27 +00:00
Code Issues Projects Releases Wiki Activity

merge of '49622a78cc682f73b0d14c2e5e0ba8cc5ddbdc89'

Browse Source 
and '6dba4565cf1a4808254012e5e6299fe143f884f5'

Monotone-Parent: 49622a78cc682f73b0d14c2e5e0ba8cc5ddbdc89
Monotone-Parent: 6dba4565cf1a4808254012e5e6299fe143f884f5
Monotone-Revision: 7a113f7bea732d33ac70591602ece2a138aee9b3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-08-11T17:30:49
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-08-11 17:30:49 +00:00
parent 72f16aee96 ee3f45e0df
commit 698a8e955a
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+10
View File
@@ -1,3 +1,13 @@
2009-08-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Scheduler/UIxComponentEditor.m
(-takeValuesFromRequest:inContext:): same as below, for the organizer.
* SoObjects/Appointments/SOGoAppointmentObject.m
(-changeParticipationStatus:forRecurrenceId): when setting the
"SENT-BY" attribute value, we need to use "setValue:0.." instead
"addValue:" to avoid invalid accumulation of values.
2009-08-11 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
SoObjects/Appointments/SOGoAppointmentObject.m
+13 -8
View File
@@ -620,10 +620,12 @@
// the attendee, we add the user to the SENT-BY attribute.
if (b && ![[currentUser login] isEqualToString: [theOwnerUser login]])
{
NSString *currentEmail;
NSString *currentEmail, *quotedEmail;
currentEmail = [[currentUser allEmails] objectAtIndex: 0];
[otherAttendee addAttribute: @"SENT-BY"
value: [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail]];
quotedEmail = [NSString stringWithFormat: @"\"MAILTO:%@\"",
currentEmail];
[otherAttendee setValue: 0 ofAttribute: @"SENT-BY"
to: quotedEmail];
}
else
{
@@ -672,10 +674,12 @@
currentUser = [context activeUser];
if (![[currentUser login] isEqualToString: [theOwnerUser login]])
{
NSString *currentEmail;
currentEmail = [[currentUser allEmails] objectAtIndex: 0];
[attendee addAttribute: @"SENT-BY"
value: [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail]];
NSString *currentEmail, *quotedEmail;
currentEmail = [[currentUser allEmails] objectAtIndex: 0];
quotedEmail = [NSString stringWithFormat: @"\"MAILTO:%@\"",
currentEmail];
[attendee setValue: 0 ofAttribute: @"SENT-BY"
to: quotedEmail];
}
else
{
@@ -1130,7 +1134,8 @@
return [self changeParticipationStatus: _status forRecurrenceId: nil];
}
- (NSException *) changeParticipationStatus: (NSString *) _status forRecurrenceId: (NSCalendarDate *) _recurrenceId
- (NSException *) changeParticipationStatus: (NSString *) _status
forRecurrenceId: (NSCalendarDate *) _recurrenceId
{
iCalCalendar *calendar;
iCalEvent *event;
UI/Scheduler/UIxComponentEditor.m
+5 -3
View File
@@ -1559,11 +1559,13 @@ RANGE(2);
if (!isOwner)
{
NSString *currentEmail;
NSString *currentEmail, *quotedEmail;
currentEmail = [[[context activeUser] allEmails] objectAtIndex: 0];
[organizer addAttribute: @"SENT-BY"
value: [NSString stringWithFormat: @"\"MAILTO:%@\"", currentEmail]];
quotedEmail = [NSString stringWithFormat: @"\"MAILTO:%@\"",
currentEmail];
[organizer setValue: 0 ofAttribute: @"SENT-BY"
to: quotedEmail];
}
}
else