LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #112 from ethoms/clang-warnings-stage5 

Stage 5 of clang compiler warning patches.
pull/101/head^2
extrafu 2015-11-03 18:06:33 -05:00
parent d9a929762f 36c1ba88a5
commit b7ebf6e781
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@ -46,6 +46,7 @@
#import <NGCards/iCalDateTime.h>
#import <NGCards/iCalTimeZone.h>
#import <NGCards/iCalTimeZonePeriod.h>
#import <NGCards/iCalToDo.h>
#import <NGCards/NSString+NGCards.h>
#import <SOGo/SOGoConstants.h>
@ -748,11 +749,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
{
e = [events objectAtIndex: i];
if ([e recurrenceId])
for (j = 0; j < [theAttendees count]; j++)
if (shouldAdd)
for (j = 0; j < [theAttendees count]; j++) {
if (shouldAdd) {
[e addToAttendees: [theAttendees objectAtIndex: j]];
else
}
else {
[e removeFromAttendees: [theAttendees objectAtIndex: j]];
}
}
}
}
@ -1038,7 +1042,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([delegateEmail length])
otherDelegate = [event findAttendeeWithEmail: delegateEmail];
else
otherDelegate = NO;
otherDelegate = nil;
/* we handle the addition/deletion of delegate users */
addDelegate = NO;
@ -1076,7 +1080,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([delegateEmail length])
otherDelegate = [event findAttendeeWithEmail: delegateEmail];
else
otherDelegate = NO;
otherDelegate = nil;
}
}
if (addDelegate)
@ -1233,7 +1237,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([delegateEmail length])
otherDelegate = [event findAttendeeWithEmail: delegateEmail];
else
otherDelegate = NO;
otherDelegate = nil;
}
[self sendEMailUsingTemplateNamed: @"Deletion"

1
Tools/SOGoToolRestore.m
View File

@ -574,6 +574,7 @@
NSLog (@" %@ (%@)",
folderKey, [currentFolder objectForKey: @"displayname"]);
}
rc = YES;
}
else
{