Monotone-Parent: c6b25920d896b2d19d0ef40a4cadee46c87bba2d

Monotone-Revision: 1c3bb3511167199e0dc7bafa4db7fc5540648666

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-10T15:49:05
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -2250,28 +2250,18 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
 - (NSString *) davCalendarShowAlarms
 {
-  NSString *boolean;
-
-  if ([self showCalendarAlarms])
-    boolean = @"true";
-  else
-    boolean = @"false";
-
-  return boolean;
+  return [self davBooleanForResult: [self showCalendarAlarms]];
 }
 
 - (NSException *) setDavCalendarShowAlarms: (id) newBoolean
 {
   NSException *error;
 
-  error = nil;
-
-  if ([newBoolean isEqualToString: @"true"]
-      || [newBoolean isEqualToString: @"1"])
-    [self setShowCalendarAlarms: YES];
-  else if ([newBoolean isEqualToString: @"false"]
-           || [newBoolean isEqualToString: @"0"])
-    [self setShowCalendarAlarms: NO];
+  if ([self isValidDAVBoolean: newBoolean])
+    {
+      [self setShowCalendarAlarms: [self resultForDAVBoolean: newBoolean]];
+      error = nil;
+    }
   else
     error = [NSException exceptionWithHTTPStatus: 400
                                           reason: @"Bad boolean value."];