propagate from branch 'ca.inverse.sogo.1_3_17' (head cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15)

to branch 'ca.inverse.sogo' (head b480939bb99d9c246f2a7f25b9728f4fff29d89e)

Monotone-Parent: b480939bb99d9c246f2a7f25b9728f4fff29d89e
Monotone-Parent: cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15
Monotone-Revision: c6b25920d896b2d19d0ef40a4cadee46c87bba2d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-10T00:29:53
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoConstants.h

@@ -44,4 +44,11 @@ typedef enum
 // Domain defaults
 extern NSString *SOGoPasswordChangeEnabled;
 
+typedef enum
+{
+  EventCreated = 0,
+  EventDeleted = 1,
+  EventUpdated = 2,
+} SOGoEventOperation;
+
 #endif /* _SOGOCONSTANTS_H_ */

SoObjects/SOGo/SOGoDomainDefaults.h

@@ -78,6 +78,8 @@
 - (BOOL) hideSystemEMail;
 
 - (int) searchMinimumWordLength;
+- (BOOL) notifyOnPersonalModifications;
+- (BOOL) notifyOnExternalModifications;
 
 @end
 

SoObjects/SOGo/SOGoDomainDefaults.m

@@ -324,4 +324,14 @@
   return [self integerForKey: @"SOGoSearchMinimumWordLength"];
 }
 
+- (BOOL) notifyOnPersonalModifications
+{
+  return [self boolForKey: @"SOGoNotifyOnPersonalModifications"];
+}
+
+- (BOOL) notifyOnExternalModifications
+{
+  return [self boolForKey: @"SOGoNotifyOnExternalModifications"];
+}
+
 @end

SoObjects/SOGo/SOGoUserDefaults.h

@@ -1,6 +1,6 @@
 /* SOGoUserDefaults.h - this file is part of SOGo
  *
- * Copyright (C) 2011 Inverse inc.
+ * Copyright (C) 2011-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -49,9 +49,6 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 - (void) setDefaultCalendar: (NSString *) newDefaultCalendar;
 - (NSString *) defaultCalendar;
 
-- (void) setAppointmentSendEMailReceipts: (BOOL) newPoil;
-- (BOOL) appointmentSendEMailReceipts;
-
 - (void) setLongDateFormat: (NSString *) newFormat;
 - (void) unsetLongDateFormat;
 - (NSString *) longDateFormat;

SoObjects/SOGo/SOGoUserDefaults.m

@@ -1,6 +1,6 @@
 /* SOGoUserDefaults.m - this file is part of SOGo
  *
- * Copyright (C) 2009-2010 Inverse inc.
+ * Copyright (C) 2009-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -243,16 +243,6 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
   return [self stringForKey: @"SOGoDefaultCalendar"];
 }
 
-- (void) setAppointmentSendEMailReceipts: (BOOL) newValue
-{
-  [self setBool: newValue forKey: @"SOGoAppointmentSendEMailReceipts"];
-}
-
-- (BOOL) appointmentSendEMailReceipts
-{
-  return [self boolForKey: @"SOGoAppointmentSendEMailReceipts"];
-}
-
 - (void) setDayStartTime: (NSString *) newValue
 {
   [self setObject: newValue forKey: @"SOGoDayStartTime"];