From 1125bfebeb74205071793309fa302fcd22dd6e32 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 19 Nov 2010 20:55:51 +0000
Subject: [PATCH] Monotone-Parent: 90739444b1a12e6713911d3fbb9502fc6c0b4269
 Monotone-Revision: da7301d3c0a55520b84d234529b84e3741006bf0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-11-19T20:55:51
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                          |  5 +++++
 ...Date+MAPIStore.h => NSCalendarDate+MAPIStore.h} |  8 ++++----
 ...Date+MAPIStore.m => NSCalendarDate+MAPIStore.m} | 14 +++++++-------
 3 files changed, 16 insertions(+), 11 deletions(-)
 rename OpenChange/{NSDate+MAPIStore.h => NSCalendarDate+MAPIStore.h} (82%)
 rename OpenChange/{NSDate+MAPIStore.m => NSCalendarDate+MAPIStore.m} (87%)

diff --git a/ChangeLog b/ChangeLog
index a49d526ff..0125614ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/NSDate+MAPIStore: renamed back to
+	NSCalendarDate+MAPIStore.
+
 2010-11-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreContactsContext.m (-createMessageInFolder:):
diff --git a/OpenChange/NSDate+MAPIStore.h b/OpenChange/NSCalendarDate+MAPIStore.h
similarity index 82%
rename from OpenChange/NSDate+MAPIStore.h
rename to OpenChange/NSCalendarDate+MAPIStore.h
index 6c096ee0f..40ee52335 100644
--- a/OpenChange/NSDate+MAPIStore.h
+++ b/OpenChange/NSCalendarDate+MAPIStore.h
@@ -1,4 +1,4 @@
-/* NSDate+MAPIStore.h - this file is part of SOGo
+/* NSCalendarDate+MAPIStore.h - this file is part of SOGo
  *
  * Copyright (C) 2010 Inverse inc.
  *
@@ -23,11 +23,11 @@
 #ifndef NSCALENDARDATE_MAPISTORE_H
 #define NSCALENDARDATE_MAPISTORE_H
 
-#import <Foundation/NSDate.h>
+#import <Foundation/NSCalendarDate.h>
 
-@interface NSDate (MAPIStoreDataTypes)
+@interface NSCalendarDate (MAPIStoreDataTypes)
 
-+ (id) dateFromFileTime: (struct FILETIME *) timeValue;
++ (id) dateFromFileTime: (const struct FILETIME *) timeValue;
 
 - (struct FILETIME *) asFileTimeInMemCtx: (void *) memCtx;
 
diff --git a/OpenChange/NSDate+MAPIStore.m b/OpenChange/NSCalendarDate+MAPIStore.m
similarity index 87%
rename from OpenChange/NSDate+MAPIStore.m
rename to OpenChange/NSCalendarDate+MAPIStore.m
index 2fc18ad47..1b83ef314 100644
--- a/OpenChange/NSDate+MAPIStore.m
+++ b/OpenChange/NSCalendarDate+MAPIStore.m
@@ -1,4 +1,4 @@
-/* NSDate+MAPIStore.m - this file is part of SOGo
+/* NSCalendarDate+MAPIStore.m - this file is part of SOGo
  *
  * Copyright (C) 2010 Inverse inc.
  *
@@ -24,15 +24,15 @@
 #import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
-#import "NSDate+MAPIStore.h"
+#import "NSCalendarDate+MAPIStore.h"
 
 #undef DEBUG
 #include <mapistore/mapistore.h>
 #include <talloc.h>
 
-static NSDate *refDate = nil;
+static NSCalendarDate *refDate = nil;
 
-@implementation NSDate (MAPIStoreDataTypes)
+@implementation NSCalendarDate (MAPIStoreDataTypes)
 
 static void
 _setupRefDate()
@@ -46,9 +46,9 @@ _setupRefDate()
   [refDate retain];
 }
 
-+ (id) dateFromFileTime: (struct FILETIME *) timeValue
++ (id) dateFromFileTime: (const struct FILETIME *) timeValue
 {
-  NSDate *result;
+  NSCalendarDate *result;
   uint64_t interval;
 
   if (!refDate)
@@ -56,7 +56,7 @@ _setupRefDate()
 
   interval = ((uint64_t) timeValue->dwHighDateTime << 32
               | timeValue->dwLowDateTime);
-  result = [[NSDate alloc]
+  result = [[NSCalendarDate alloc]
              initWithTimeInterval: (NSTimeInterval) interval / 10000000
                         sinceDate: refDate];
   [result autorelease];