style(obj-c): improve formatting
parent
38b95af9fd
commit
451989ac9c
|
@ -52,8 +52,7 @@
|
|||
* There's no GUI to defined such conditions, so there's no
|
||||
* problem for now.
|
||||
*/
|
||||
- (NSArray *)
|
||||
recurrenceRangesWithinCalendarDateRange: (NGCalendarDateRange *) _r
|
||||
- (NSArray *) recurrenceRangesWithinCalendarDateRange: (NGCalendarDateRange *) _r
|
||||
{
|
||||
NSMutableArray *ranges;
|
||||
NSCalendarDate *firStart, *startDate, *endDate, *currentStartDate, *currentEndDate;
|
||||
|
|
|
@ -495,8 +495,7 @@ Class SOGoContactSourceFolderK;
|
|||
ascending: YES];
|
||||
descriptors = [NSArray arrayWithObjects: commonNameDescriptor, nil];
|
||||
[commonNameDescriptor release];
|
||||
sortedContacts = [[uniqueContacts allValues]
|
||||
sortedArrayUsingDescriptors: descriptors];
|
||||
sortedContacts = [[uniqueContacts allValues] sortedArrayUsingDescriptors: descriptors];
|
||||
}
|
||||
else
|
||||
sortedContacts = [NSArray array];
|
||||
|
|
|
@ -433,10 +433,9 @@ static NSString *inboxFolderName = @"INBOX";
|
|||
[folderPaths addObject: namespace];
|
||||
}
|
||||
}
|
||||
[folderPaths
|
||||
sortUsingSelector: @selector (localizedCaseInsensitiveCompare:)];
|
||||
[folderPaths sortUsingSelector: @selector (localizedCaseInsensitiveCompare:)];
|
||||
[folderPaths replaceObjectsInRange: NSMakeRange (0, 0)
|
||||
withObjectsFromArray: mainFolders];
|
||||
withObjectsFromArray: mainFolders];
|
||||
|
||||
return folderPaths;
|
||||
}
|
||||
|
|
|
@ -213,7 +213,6 @@ static BOOL debugOn = NO;
|
|||
{
|
||||
NGMimeMessage *m;
|
||||
id part;
|
||||
|
||||
int i;
|
||||
|
||||
m = [[o content] messageFromOpaqueSignedData];
|
||||
|
@ -222,7 +221,7 @@ static BOOL debugOn = NO;
|
|||
for (i = 0; i < [[self bodyPartPath] count]; i++)
|
||||
{
|
||||
nbr = [[[self bodyPartPath] objectAtIndex: i] intValue]-1;
|
||||
part = [[part parts] objectAtIndex: nbr];;
|
||||
part = [[part parts] objectAtIndex: nbr];
|
||||
}
|
||||
|
||||
part = [[part parts] objectAtIndex: ([key intValue]-1)];
|
||||
|
|
|
@ -1239,10 +1239,9 @@ static Class NSNullK;
|
|||
- (NSArray *) fetchUsersMatching: (NSString *) filter
|
||||
inDomain: (NSString *) domain
|
||||
{
|
||||
return [self
|
||||
_fetchEntriesInSources: [self authenticationSourceIDsInDomain: domain]
|
||||
matching: filter
|
||||
inDomain: domain];
|
||||
return [self _fetchEntriesInSources: [self authenticationSourceIDsInDomain: domain]
|
||||
matching: filter
|
||||
inDomain: domain];
|
||||
}
|
||||
|
||||
- (NSString *) getLoginForDN: (NSString *) theDN
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
s = [[info objectForKey:@"disposition"] objectForKey: @"type"];
|
||||
|
||||
shouldDisplay = (s && ([s caseInsensitiveCompare: @"ATTACHMENT"] == NSOrderedSame));
|
||||
|
||||
|
||||
if (!shouldDisplay && !textPart)
|
||||
shouldDisplay = ([[info objectForKey: @"bodyId"] length] ? YES : NO);
|
||||
|
||||
|
@ -199,7 +199,7 @@ static BOOL showNamedTextAttachmentsInline = NO;
|
|||
return [self signedViewer];
|
||||
else if ([st isEqualToString: @"alternative"])
|
||||
return [self alternativeViewer];
|
||||
|
||||
|
||||
if ([st isEqualToString: @"report"])
|
||||
/* this is used by mail-delivery reports */
|
||||
return [self mixedViewer];
|
||||
|
@ -209,15 +209,15 @@ static BOOL showNamedTextAttachmentsInline = NO;
|
|||
if ([st isEqualToString: @"plain"] || [st isEqualToString: @"html"]) {
|
||||
if (!showNamedTextAttachmentsInline && [self _shouldDisplayAsAttachment: _info textPart: YES])
|
||||
return [self linkViewer];
|
||||
|
||||
|
||||
return [st isEqualToString: @"html"]
|
||||
? [self htmlViewer] : [self textViewer];
|
||||
}
|
||||
|
||||
|
||||
if ([st isEqualToString:@"calendar"])
|
||||
return [self iCalViewer];
|
||||
}
|
||||
|
||||
|
||||
// TIFF files aren't well-supported and Thunderbird sometimes send PDF
|
||||
// files over as image/pdf !
|
||||
if ([mt isEqualToString: @"image"] &&
|
||||
|
@ -225,22 +225,22 @@ static BOOL showNamedTextAttachmentsInline = NO;
|
|||
{
|
||||
if ([self _shouldDisplayAsAttachment: _info textPart: NO] || [st isEqualToString: @"svg+xml"])
|
||||
return [self linkViewer];
|
||||
|
||||
|
||||
return [self imageViewer];
|
||||
}
|
||||
|
||||
|
||||
if ([mt isEqualToString: @"message"] && [st isEqualToString: @"rfc822"])
|
||||
return [self messageViewer];
|
||||
|
||||
|
||||
if ([mt isEqualToString: @"message"] &&
|
||||
[st isEqualToString: @"delivery-status"]) {
|
||||
/*
|
||||
Content-Description: Delivery error report
|
||||
Content-Type: message/delivery-status
|
||||
|
||||
|
||||
Reporting-MTA: dns; mail.opengroupware.org
|
||||
Arrival-Date: Mon, 18 Jul 2005 12:08:43 +0200 (CEST)
|
||||
|
||||
|
||||
Final-Recipient: rfc822; ioioi@plop.com
|
||||
Action: failed
|
||||
Status: 5.0.0
|
||||
|
@ -317,10 +317,10 @@ static NSString *MRK = @"UIxMailRenderingContext";
|
|||
- (UIxMailRenderingContext *) popMailRenderingContext
|
||||
{
|
||||
UIxMailRenderingContext *mctx;
|
||||
|
||||
|
||||
if ((mctx = [self objectForKey:MRK]) == nil)
|
||||
return nil;
|
||||
|
||||
|
||||
mctx = [[mctx retain] autorelease];
|
||||
[self removeObjectForKey:MRK];
|
||||
return mctx;
|
||||
|
|
Loading…
Reference in New Issue