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

Stage 5 of clang compiler warning patches.

Browse source
This commit is contained in:
Euan Thoms 2015-11-04 05:28:03 +08:00
parent e5c71a4179
commit 36c1ba88a5
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/iCalDateTime.h>
#import <NGCards/iCalTimeZone.h> #import <NGCards/iCalTimeZone.h>
#import <NGCards/iCalTimeZonePeriod.h> #import <NGCards/iCalTimeZonePeriod.h>
#import <NGCards/iCalToDo.h>
#import <NGCards/NSString+NGCards.h> #import <NGCards/NSString+NGCards.h>
#import <SOGo/SOGoConstants.h> #import <SOGo/SOGoConstants.h>
@ -748,12 +749,15 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
{ {
e = [events objectAtIndex: i]; e = [events objectAtIndex: i];
if ([e recurrenceId]) if ([e recurrenceId])
for (j = 0; j < [theAttendees count]; j++) for (j = 0; j < [theAttendees count]; j++) {
if (shouldAdd) if (shouldAdd) {
[e addToAttendees: [theAttendees objectAtIndex: j]]; [e addToAttendees: [theAttendees objectAtIndex: j]];
else }
else {
[e removeFromAttendees: [theAttendees objectAtIndex: j]]; [e removeFromAttendees: [theAttendees objectAtIndex: j]];
} }
}
}
} }
// //
@ -1038,7 +1042,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([delegateEmail length]) if ([delegateEmail length])
otherDelegate = [event findAttendeeWithEmail: delegateEmail]; otherDelegate = [event findAttendeeWithEmail: delegateEmail];
else else
otherDelegate = NO; otherDelegate = nil;
/* we handle the addition/deletion of delegate users */ /* we handle the addition/deletion of delegate users */
addDelegate = NO; addDelegate = NO;
@ -1076,7 +1080,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([delegateEmail length]) if ([delegateEmail length])
otherDelegate = [event findAttendeeWithEmail: delegateEmail]; otherDelegate = [event findAttendeeWithEmail: delegateEmail];
else else
otherDelegate = NO; otherDelegate = nil;
} }
} }
if (addDelegate) if (addDelegate)
@ -1233,7 +1237,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([delegateEmail length]) if ([delegateEmail length])
otherDelegate = [event findAttendeeWithEmail: delegateEmail]; otherDelegate = [event findAttendeeWithEmail: delegateEmail];
else else
otherDelegate = NO; otherDelegate = nil;
} }
[self sendEMailUsingTemplateNamed: @"Deletion" [self sendEMailUsingTemplateNamed: @"Deletion"

1
Tools/SOGoToolRestore.m
View file

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