Monotone-Parent: 1ee824cc2519285b798ee5a9b6d741e19bf29966

Monotone-Revision: b07d31699d6b961e69129af2d768322df3b7fee9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-22T17:32:06
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,10 @@
+2010-01-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Tools/SOGoToolRestore.m (+initialize): we need to invoke
+	[iCalEntityObject+SOGo initializeSOGoExtensions], otherwise the
+	extraction of quick records will cause a crash because some global
+	variables won't be initialized.
+
 2010-01-21  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxCalListingActions.m

SoObjects/Appointments/iCalEntityObject+SOGo.h

@@ -27,8 +27,8 @@
 
 @class SOGoUser;
 
-NSCalendarDate *iCalDistantFuture;
-NSNumber *iCalDistantFutureNumber;
+extern NSCalendarDate *iCalDistantFuture;
+extern NSNumber *iCalDistantFutureNumber;
 
 @interface iCalEntityObject (SOGoExtensions)
 

SoObjects/Appointments/iCalEntityObject+SOGo.m

@@ -42,9 +42,12 @@
 
 #import "iCalEntityObject+SOGo.h"
 
+NSCalendarDate *iCalDistantFuture = nil;
+NSNumber *iCalDistantFutureNumber = nil;
+
 @implementation iCalEntityObject (SOGoExtensions)
 
-+ (void) initializeSOGoExtensions;
++ (void) initializeSOGoExtensions
 {
   if (!iCalDistantFuture)
     {

Tools/SOGoToolRestore.m

@@ -33,6 +33,7 @@
 #import <GDLContentStore/GCSFolder.h>
 #import <GDLContentStore/NSURL+GCS.h>
 
+#import <Appointments/iCalEntityObject+SOGo.h>
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoUser.h>
@@ -63,6 +64,8 @@
   [bm setBundleSearchPaths: [NSArray arrayWithObject: SOGO_LIBDIR]];
   [[bm bundleWithName: @"Appointments" type: @"SOGo"] load];
   [[bm bundleWithName: @"Contacts" type: @"SOGo"] load];
+
+  [iCalEntityObject initializeSOGoExtensions];
 }
 
 + (NSString *) command