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

See ChangeLog

Browse Source 
Monotone-Parent: 8d42e44b72c2c9e6431e77f6b5c590736449f7d7
Monotone-Revision: bafccbe12139895411068d388269aca400af46ec

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-01T13:49:24
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2009-04-01 13:49:24 +00:00
parent 4d8563ac99
commit 8f2318fe52
56 changed files with 164 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+7 -6
View File
@@ -1,14 +1,15 @@
/*
Copyright (C) 2007-2009 Inverse inc.
Copyright (C) 2004 SKYRIX Software AG
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -83,7 +84,7 @@
st = [[[childParts objectAtIndex:i] valueForKey:@"subtype"]
lowercaseString];
mt = [[mt stringByAppendingString:@"/"] stringByAppendingString:st];
[types addObject:mt ? mt : (id)[NSNull null]];
[types addObject:mt ? (id)mt : (id)[NSNull null]];
}
return types;
}
@@ -186,8 +187,8 @@
pp = [self partPath];
return [pp count] > 0
? [pp arrayByAddingObject:[self childPartName]]
: [NSArray arrayWithObject:[self childPartName]];
? (id)[pp arrayByAddingObject:[self childPartName]]
: (id)[NSArray arrayWithObject:[self childPartName]];
}
/* nested viewers */
UI/MailPartViewers/UIxMailPartHTMLViewer.m
+2 -2
View File
@@ -1,6 +1,6 @@
/* UIxMailPartHTMLViewer.m - this file is part of SOGo
*
* Copyright (C) 2007, 2008 Inverse inc.
* Copyright (C) 2007-2009 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
@@ -142,7 +142,7 @@ _xmlCharsetForCharset (NSString *charset)
return hasExternalImages;
}
- (BOOL) setUnsafe: (BOOL) b
- (void) setUnsafe: (BOOL) b
{
unsafe = b;
}
UI/MailPartViewers/UIxMailPartICalActions.m
+4 -4
View File
@@ -166,7 +166,7 @@
recurrenceTime = [NSString stringWithFormat: @"%f",
[[emailEvent recurrenceId] timeIntervalSince1970]];
calendarEvent = [*eventObject lookupOccurence: recurrenceTime];
calendarEvent = (iCalEvent *)[*eventObject lookupOccurence: recurrenceTime];
}
else
calendarEvent = (iCalEvent *) [*eventObject component: NO
@@ -223,7 +223,7 @@
{
// We must update main event and all its occurences (if any).
calendar = [eventObject calendar: NO secure: NO];
event = [calendar firstChildWithTag: [eventObject componentTag]];
event = (iCalEvent *)[calendar firstChildWithTag: [eventObject componentTag]];
events = [calendar allObjects];
}
else
@@ -231,11 +231,11 @@
// If recurrenceId is defined, find the specified occurence
// within the repeating vEvent.
recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
event = [eventObject lookupOccurence: recurrenceTime];
event = (iCalEvent *)[eventObject lookupOccurence: recurrenceTime];
if (event == nil)
// If no occurence found, create one
event = [eventObject newOccurenceWithID: recurrenceTime];
event = (iCalEvent *)[eventObject newOccurenceWithID: recurrenceTime];
events = [NSArray arrayWithObject: event];
}
UI/MailPartViewers/UIxMailPartICalViewer.m
+1 -1
View File
@@ -329,7 +329,7 @@
organizer = [storedEvent organizer];
if (organizer == nil || [organizer isVoid])
{
organizer = [[[storedEvent parent] firstChildWithTag: [storedEventObject componentTag]] organizer];
organizer = [(iCalEntityObject *)[[storedEvent parent] firstChildWithTag: [storedEventObject componentTag]] organizer];
[storedEvent setOrganizer: organizer];
}
}
UI/MailPartViewers/UIxMailPartMessageViewer.m
+6 -5
View File
@@ -1,14 +1,15 @@
/*
Copyright (C) 2007-2009 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -108,8 +109,8 @@
pp = [self partPath];
return (([pp count] > 0)
? [pp arrayByAddingObject: @"1"]
: [NSArray arrayWithObject: @"1"]);
? (id)[pp arrayByAddingObject: @"1"]
: (id)[NSArray arrayWithObject: @"1"]);
}
- (id) contentViewerComponent
UI/MailPartViewers/UIxMailPartMixedViewer.m
+6 -5
View File
@@ -1,14 +1,15 @@
/*
Copyright (C) 2007-2009 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -74,8 +75,8 @@
pp = [self partPath];
return [pp count] > 0
? [pp arrayByAddingObject:[self childPartName]]
: [NSArray arrayWithObject:[self childPartName]];
? (id)[pp arrayByAddingObject:[self childPartName]]
: (id)[NSArray arrayWithObject:[self childPartName]];
}
/* nested viewers */
UI/MailPartViewers/UIxMailPartViewer.m
+7 -6
View File
@@ -1,14 +1,15 @@
/*
Copyright (C) 2007-2009 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -105,7 +106,7 @@
- (NSData *) flatContent
{
if (flatContent != nil)
return [flatContent isNotNull] ? flatContent : nil;
return [flatContent isNotNull] ? (id)flatContent : nil;
flatContent =
[[[context mailRenderingContext] flatContentForPartPath:
@@ -284,8 +285,8 @@
s = [partPath componentsJoinedByString:@"-"];
return ([s length] > 0)
? [@"untitled-" stringByAppendingString:s]
: @"untitled";
? (id)[@"untitled-" stringByAppendingString:s]
: (id)@"untitled";
}
- (NSFormatter *) sizeFormatter
UI/MailPartViewers/UIxMailRenderingContext.m
+5 -4
View File
@@ -1,14 +1,15 @@
/*
Copyright (C) 2007-2009 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo is free software; you can redistribute it and/or modify it under
SOGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
@@ -110,7 +111,7 @@ static BOOL showNamedTextAttachmentsInline = NO;
NSString *pid;
NSData *content;
pid = _partPath ? [_partPath componentsJoinedByString: @"."] : @"";
pid = _partPath ? (id)[_partPath componentsJoinedByString: @"."] : (id)@"";
content = [[self flatContents] objectForKey: pid];
if (!content && ![pid intValue])
content = [flatContents objectForKey: @""];