git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1213 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index ce73e9ed1102197a02a8f7fae977e56ff81d9577..2278ba7c161f54b8e76dfa4f90e528b68c0a1ca7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor -extractQuickFieldsFromEvent:_event])
+       ([OCSiCalFieldExtractor -extractQuickFieldsFromTodo:_task]):
+       set title to an empty string where the event/task summary is null.
+
        * SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject
        -setHeaders:newHeaders]): make sure there is a message id in the
        headers dictionary, if not, generate one.

diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
index 1c92971318c6a0eb682ee061531b6744630a2885..cda920e27ec1d84ac3c08a2994c0e8fe5abdec9c 100644 (file)
--- a/OGoContentStore/OCSiCalFieldExtractor.m
+++ b/OGoContentStore/OCSiCalFieldExtractor.m
@@ -89,6 +89,8 @@ static NSNumber *distantFutureNumber = nil;
   endDate = [_event endDate];
   uid = [_event uid];
   title = [_event summary];
+  if (![title isNotNull])
+    title = @"";
   location = [_event location];
   sequence = [_event sequence];
   accessClass = [_event symbolicAccessClass];
@@ -122,7 +124,7 @@ static NSNumber *distantFutureNumber = nil;
   [row setObject: [NSNumber numberWithInt: [_event priorityNumber]]
        forKey: @"c_priority"];
 
-  if ([title isNotNull]) [row setObject: title forKey: @"c_title"];
+  [row setObject: title forKey: @"c_title"];
   if ([location isNotNull]) [row setObject: location forKey: @"c_location"];
   if ([sequence isNotNull]) [row setObject: sequence forKey: @"c_sequence"];
 
@@ -230,6 +232,8 @@ static NSNumber *distantFutureNumber = nil;
   dueDate = [_task due];
   uid = [_task uid];
   title = [_task summary];
+  if (![title isNotNull])
+    title = @"";
   location = [_task location];
   sequence = [_task sequence];
   accessClass = [_task symbolicAccessClass];
@@ -262,7 +266,7 @@ static NSNumber *distantFutureNumber = nil;
   [row setObject: [NSNumber numberWithBool: NO]
        forKey: @"c_isopaque"];
 
-  if ([title isNotNull]) [row setObject: title forKey: @"c_title"];
+  [row setObject: title forKey: @"c_title"];
   if ([location isNotNull]) [row setObject: location forKey: @"c_location"];
   if ([sequence isNotNull]) [row setObject: sequence forKey: @"c_sequence"];