git-svn-id: http://svn.opengroupware.org/SOGo/trunk@242 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 83cbd2486e5f9c8070e20ec893e5435455ce06f3..ded3c466589c93db47bbb06df7f581a684feab7c 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-16  Helge Hess  <helge.hess@skyrix.com>
+
+       * iCalPerson+UIx.m: fixed -cnForDisplay to properly check for quotes
+         prior removing them (v0.9.52)
+
 2004-08-15  Helge Hess  <helge.hess@skyrix.com>
 
        * UIxAppointmentEditor.m: fixed for new time fields (v0.9.51)

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 0349c17ff7a6e5fc738f28707c36f6ce70e18e26..ef83069e1c975ef329b26815cb8bebb9bac7a391 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -336,9 +336,8 @@
 
 - (void)saveValuesIntoAppointment:(SOGoAppointment *)_appointment {
   /* merge in form values */
-  NSArray        *attendees, *lResources;
+  NSArray *attendees, *lResources;
   
-#warning TODO: broken for the new date/time selector!
   [_appointment setStartDate:[self aptStartDate]];
   [_appointment setEndDate:[self aptEndDate]];
   

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 3d3a7dc266f2c3f8de9f415ca9bf6e916c062c5f..0a10d2c5806da406b7017b35e91f91184e13af3f 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=51
+SUBMINOR_VERSION:=52
 
 # v0.9.41 requires libNGObjWeb     v4.2.431
 # v0.9.31 requires libWEExtensions v4.2.52

diff --git a/SOGo/UI/Scheduler/iCalPerson+UIx.m b/SOGo/UI/Scheduler/iCalPerson+UIx.m
index b2581df73f7e160e8be3ad3e5a6fcc8b70fa1001..acdd759b17edd4517e3e5e80ede16bc4830eb089 100644 (file)
--- a/SOGo/UI/Scheduler/iCalPerson+UIx.m
+++ b/SOGo/UI/Scheduler/iCalPerson+UIx.m
@@ -39,19 +39,18 @@
 }
 
 - (NSString *)cnForDisplay {
-#if 1
-#  warning TODO: ask znek what this was good for
-  return [self cn];
-#else
+  /* remove quotes around a CN */
   NSString *_cn;
   
-  /* Note: this breaks the CN with the new appointment editor */
-  /* if this is for quoting, we need to actually check for quotes! */
   _cn = [self cn];
-  if ([_cn length] > 2)
-    return [_cn substringWithRange:NSMakeRange(1, [_cn length] - 2)];
-  return _cn;
-#endif
+  if ([_cn length] <= 2)
+    return _cn;
+  if ([_cn characterAtIndex:0] != '"')
+    return _cn;
+  if (![_cn hasSuffix:@"\""])
+    return _cn;
+  
+  return [_cn substringWithRange:NSMakeRange(1, [_cn length] - 2)];
 }
 
 @end /* iCalPerson(Convenience) */