From 8dfda2873f790061e9ce346c82a2edb8ecded496 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 30 May 2011 21:12:56 +0000
Subject: [PATCH] Monotone-Parent: ab4b56bae1b03fc971ec45c668ed8a6bd9b23831
 Monotone-Revision: c65e5de16bdce7bebdde2adc5fd2504e2066e9f2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-05-30T21:12:56
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  4 ++++
 OpenChange/GNUmakefile                        |  2 +-
 OpenChange/MAPIStoreCalendarMessage.m         |  3 ++-
 OpenChange/MAPIStoreCalendarMessageTable.m    |  2 +-
 OpenChange/MAPIStoreContactsMessage.m         |  3 ++-
 OpenChange/MAPIStoreContactsMessageTable.m    |  2 +-
 OpenChange/MAPIStoreGCSFolder.h               |  2 ++
 OpenChange/MAPIStoreGCSFolder.m               |  3 +++
 OpenChange/MAPIStoreMailAttachment.m          |  2 +-
 OpenChange/MAPIStoreObject.h                  |  1 +
 OpenChange/MAPIStoreRecurrenceUtils.m         |  2 +-
 OpenChange/MAPIStoreTasksMessage.m            |  2 +-
 OpenChange/MAPIStoreTasksMessageTable.m       |  2 +-
 OpenChange/MAPIStoreTypes.m                   |  2 +-
 ...darDate+MAPIStore.h => NSDate+MAPIStore.h} |  6 +++---
 ...darDate+MAPIStore.m => NSDate+MAPIStore.m} | 20 +++++++++++++------
 OpenChange/NSObject+MAPIStore.m               |  2 +-
 17 files changed, 40 insertions(+), 20 deletions(-)
 rename OpenChange/{NSCalendarDate+MAPIStore.h => NSDate+MAPIStore.h} (88%)
 rename OpenChange/{NSCalendarDate+MAPIStore.m => NSDate+MAPIStore.m} (86%)

diff --git a/ChangeLog b/ChangeLog
index f23d6ff8f..42bf6b594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSDate+MAPIStore.[hm]: renamed from
+	NSCalendarDate+MAPIStore.[hm]. Provides the same methods as
+	before but on NSDate rather than NSCalendarDate.
+
 	* OpenChange/gen-property-selectors.py (ParseExchangeHDefinition):
 	Fixed exclusion of records ending with "Error" and "Unicode".
 	Also, we now exclude PidTag properties with a value > 0x80000000
diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index 8d8c49bb0..c7a7efe9b 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -101,8 +101,8 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	\
 	NSArray+MAPIStore.m \
 	NSAutoreleasePool+MAPIStore.m \
-	NSCalendarDate+MAPIStore.m \
 	NSData+MAPIStore.m \
+	NSDate+MAPIStore.m \
 	NSObject+MAPIStore.m \
 	NSString+MAPIStore.m \
 	NSValue+MAPIStore.m \
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 11ffcfd25..db208d4f7 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -25,6 +25,7 @@
    - take the tz definitions from Outlook */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
@@ -44,7 +45,7 @@
 #import "MAPIStoreContext.h"
 #import "MAPIStoreRecurrenceUtils.h"
 #import "MAPIStoreTypes.h"
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "NSValue+MAPIStore.h"
diff --git a/OpenChange/MAPIStoreCalendarMessageTable.m b/OpenChange/MAPIStoreCalendarMessageTable.m
index 1e0338e95..1911ac9e1 100644
--- a/OpenChange/MAPIStoreCalendarMessageTable.m
+++ b/OpenChange/MAPIStoreCalendarMessageTable.m
@@ -28,7 +28,7 @@
 #import <NGCards/iCalEvent.h>
 
 #import "MAPIStoreTypes.h"
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
 #import "MAPIStoreCalendarMessageTable.h"
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index ddeca15c1..c1e33bd5f 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -32,7 +33,7 @@
 #import "MAPIStorePropertySelectors.h"
 #import "MAPIStoreTypes.h"
 #import "NSArray+MAPIStore.h"
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index 469052aee..b2101b6a4 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -31,7 +31,7 @@
 #import <Contacts/SOGoContactGCSEntry.h>
 
 #import "MAPIStoreTypes.h"
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSArray+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
diff --git a/OpenChange/MAPIStoreGCSFolder.h b/OpenChange/MAPIStoreGCSFolder.h
index 691d620a5..fdc42679f 100644
--- a/OpenChange/MAPIStoreGCSFolder.h
+++ b/OpenChange/MAPIStoreGCSFolder.h
@@ -25,6 +25,8 @@
 
 #import "MAPIStoreFolder.h"
 
+@class NSCalendarDate;
+
 @interface MAPIStoreGCSFolder : MAPIStoreFolder
 
 /* subclasses */
diff --git a/OpenChange/MAPIStoreGCSFolder.m b/OpenChange/MAPIStoreGCSFolder.m
index c42b9bf7a..64882d8c8 100644
--- a/OpenChange/MAPIStoreGCSFolder.m
+++ b/OpenChange/MAPIStoreGCSFolder.m
@@ -21,12 +21,15 @@
  */
 
 #import <Foundation/NSString.h>
+#import <Foundation/NSCalendarDate.h>
 #import <EOControl/EOQualifier.h>
 #import <EOControl/EOFetchSpecification.h>
 #import <GDLContentStore/GCSFolder.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoGCSFolder.h>
 
+#import "NSDate+MAPIStore.h"
+
 #import "MAPIStoreGCSFolder.h"
 
 @implementation MAPIStoreGCSFolder
diff --git a/OpenChange/MAPIStoreMailAttachment.m b/OpenChange/MAPIStoreMailAttachment.m
index 56ed0086b..ff1653382 100644
--- a/OpenChange/MAPIStoreMailAttachment.m
+++ b/OpenChange/MAPIStoreMailAttachment.m
@@ -32,8 +32,8 @@
 
 #import "MAPIStoreTypes.h"
 #import "MAPIStoreMailMessage.h"
-#import "NSCalendarDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
 #import "MAPIStoreMailAttachment.h"
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index c6916567d..1c1e07f6a 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -25,6 +25,7 @@
 
 #import <Foundation/NSObject.h>
 
+@class NSCalendarDate;
 @class NSString;
 @class NSMutableArray;
 @class NSMutableDictionary;
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.m b/OpenChange/MAPIStoreRecurrenceUtils.m
index e7297f236..3124d919d 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.m
+++ b/OpenChange/MAPIStoreRecurrenceUtils.m
@@ -29,7 +29,7 @@
 #import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalByDayMask.h>
 
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "MAPIStoreRecurrenceUtils.h"
 
 @implementation iCalCalendar (MAPIStoreRecurrence)
diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m
index b21bd5f67..b11266693 100644
--- a/OpenChange/MAPIStoreTasksMessage.m
+++ b/OpenChange/MAPIStoreTasksMessage.m
@@ -35,7 +35,7 @@
 #import <Appointments/SOGoAppointmentObject.h>
 
 #import "MAPIStoreTypes.h"
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
 #import "MAPIStoreTasksMessage.h"
diff --git a/OpenChange/MAPIStoreTasksMessageTable.m b/OpenChange/MAPIStoreTasksMessageTable.m
index e53edbbe7..081dbc75d 100644
--- a/OpenChange/MAPIStoreTasksMessageTable.m
+++ b/OpenChange/MAPIStoreTasksMessageTable.m
@@ -29,8 +29,8 @@
 #import <Appointments/SOGoTaskObject.h>
 
 #import "MAPIStoreTypes.h"
-#import "NSCalendarDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
 #import "MAPIStoreTasksMessageTable.h"
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index 5d61ca4b8..e063bbbd3 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -34,7 +34,7 @@
 #import <Foundation/NSString.h>
 
 #import "NSData+MAPIStore.h"
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 
 #import "MAPIStoreTypes.h"
 
diff --git a/OpenChange/NSCalendarDate+MAPIStore.h b/OpenChange/NSDate+MAPIStore.h
similarity index 88%
rename from OpenChange/NSCalendarDate+MAPIStore.h
rename to OpenChange/NSDate+MAPIStore.h
index cdbb0effb..a36fb5e16 100644
--- a/OpenChange/NSCalendarDate+MAPIStore.h
+++ b/OpenChange/NSDate+MAPIStore.h
@@ -1,4 +1,4 @@
-/* NSCalendarDate+MAPIStore.h - this file is part of SOGo
+/* NSDate+MAPIStore.h - this file is part of SOGo
  *
  * Copyright (C) 2010 Inverse inc.
  *
@@ -23,9 +23,9 @@
 #ifndef NSCALENDARDATE_MAPISTORE_H
 #define NSCALENDARDATE_MAPISTORE_H
 
-#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDate.h>
 
-@interface NSCalendarDate (MAPIStoreDataTypes)
+@interface NSDate (MAPIStoreDataTypes)
 
 + (id) dateFromMinutesSince1601: (uint32_t) minutes;
 - (uint32_t) asMinutesSince1601;
diff --git a/OpenChange/NSCalendarDate+MAPIStore.m b/OpenChange/NSDate+MAPIStore.m
similarity index 86%
rename from OpenChange/NSCalendarDate+MAPIStore.m
rename to OpenChange/NSDate+MAPIStore.m
index c6b747b73..63d83a0a7 100644
--- a/OpenChange/NSCalendarDate+MAPIStore.m
+++ b/OpenChange/NSDate+MAPIStore.m
@@ -1,4 +1,4 @@
-/* NSCalendarDate+MAPIStore.m - this file is part of SOGo
+/* NSDate+MAPIStore.m - this file is part of SOGo
  *
  * Copyright (C) 2010 Inverse inc.
  *
@@ -24,7 +24,7 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 
 #undef DEBUG
 #include <mapistore/mapistore.h>
@@ -32,7 +32,13 @@
 
 static NSCalendarDate *refDate = nil;
 
-@implementation NSCalendarDate (MAPIStoreDataTypes)
+@interface NSDate (MAPIStorePossibleMethods)
+
+- (NSTimeZone *) timeZone;
+
+@end
+
+@implementation NSDate (MAPIStoreDataTypes)
 
 static void
 _setupRefDate ()
@@ -64,9 +70,11 @@ _setupRefDate ()
   if (!refDate)
     _setupRefDate ();
 
-  minutes = (uint32_t) ([self timeIntervalSinceDate: refDate] / 60);
-  offset = [[self timeZone] secondsFromGMT];
-  minutes += (offset / 60);
+  if ([self respondsToSelector: @selector (timeZone)])
+    offset = [[self timeZone] secondsFromGMT];
+  else
+    offset = 0;
+  minutes = (uint32_t) (([self timeIntervalSinceDate: refDate] + offset) / 60);
 
   return minutes;
 }
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index bee3734be..772816e1f 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -23,7 +23,7 @@
 #import <NGExtensions/NSObject+Logs.h>
 
 #import "NSData+MAPIStore.h"
-#import "NSCalendarDate+MAPIStore.h"
+#import "NSDate+MAPIStore.h"
 #import "NSValue+MAPIStore.h"
 #import "NSString+MAPIStore.h"