Monotone-Parent: ab4b56bae1b03fc971ec45c668ed8a6bd9b23831

Monotone-Revision: c65e5de16bdce7bebdde2adc5fd2504e2066e9f2 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-05-30T21:12:56 Monotone-Branch: ca.inverse.sogo
2026-03-12 02:11:23 +00:00 · 2011-05-30 21:12:56 +00:00
parent 09e223836a
commit 8dfda2873f
17 changed files with 40 additions and 20 deletions
--- a/4
+++ b/4
@@ -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
--- 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 \
--- 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"
--- 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"
--- 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"

--- 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"
--- a/OpenChange/MAPIStoreGCSFolder.h
+++ b/OpenChange/MAPIStoreGCSFolder.h
@@ -25,6 +25,8 @@

 #import "MAPIStoreFolder.h"

+@class NSCalendarDate;
+
@interface MAPIStoreGCSFolder : MAPIStoreFolder

 /* subclasses */
--- 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
--- 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"
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -25,6 +25,7 @@

 #import <Foundation/NSObject.h>

+@class NSCalendarDate;
@class NSString;
@class NSMutableArray;
@class NSMutableDictionary;
--- 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)
--- 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"
--- 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"
--- 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"

--- a/OpenChange/NSCalendarDate+MAPIStore.h
+++ b/OpenChange/NSCalendarDate+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;
--- a/OpenChange/NSCalendarDate+MAPIStore.m
+++ b/OpenChange/NSCalendarDate+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;
 }
--- 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"