amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-12 16:58:51 +00:00
Code Issues Projects Releases Wiki Activity

merge of '33c96e6881c7a8bafb056ea86ca1517c42edb343'

Browse Source 
and '5a7b30b7d5f425b2c0c3b96e6f1afb39c15257d7'

Monotone-Parent: 33c96e6881c7a8bafb056ea86ca1517c42edb343
Monotone-Parent: 5a7b30b7d5f425b2c0c3b96e6f1afb39c15257d7
Monotone-Revision: 4ac4ae3613d51d31b8aa0f22e8581e25651b89fd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-02T15:02:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-06-02 15:02:46 +00:00
parent f3b15c68be 853060fbee
commit 26cb2290ac
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2010-06-02 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalListingActions.m (_userStateInEvent): fixed
array indexes that would cause the user participation state to no
longer be returned.
2010-06-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/WORequest+SOGo.m (-handledByDefaultHandler): test

6
UI/Scheduler/UIxCalListingActions.m
View File

@@ -636,8 +636,8 @@ _userStateInEvent (NSArray *event)
participants = nil;
state = iCalPersonPartStatOther;
partList = [event objectAtIndex: 9];
stateList = [event objectAtIndex: 10];
partList = [event objectAtIndex: 10];
stateList = [event objectAtIndex: 11];
if ([partList length] && [stateList length])
{
participants = [partList componentsSeparatedByString: @"\n"];
@@ -646,7 +646,7 @@ _userStateInEvent (NSArray *event)
max = [participants count];
while (state == iCalPersonPartStatOther && count < max)
{
user = [SOGoUser userWithLogin: [event objectAtIndex: 11]
user = [SOGoUser userWithLogin: [event objectAtIndex: 12]
roles: nil];
if ([user hasEmail: [participants objectAtIndex: count]])
state = [[states objectAtIndex: count] intValue];