cleanup, bugfixes

[scalable-opengroupware.org] / SOGo / SoObjects / Appointments / SOGoAppointmentObject.m

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m b/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m
index 9da8460392b07c04894bde6886f2d7ec534f3c10..70250582c21590439dd95d6a75f462fab6bad6d4 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -59,12 +59,10 @@
   
   /* add organizer */
   
-  email = [[_apt organizer] email];
+  email = [[_apt organizer] rfc822Email];
   if ([email isNotNull]) {
     uid = [um getUIDForEmail:email];
     if ([uid isNotNull]) {
-      if ([uid hasPrefix:@"mailto:"])
-       uid = [uid substringFromIndex:7];
       [uids addObject:uid];
     }
     else
@@ -77,7 +75,7 @@
     iCalPerson *person;
     
     person = [attendees objectAtIndex:i];
-    email  = [person email];
+    email  = [person rfc822Email];
     if (![email isNotNull]) continue;
     
     uid = [um getUIDForEmail:email];
@@ -85,9 +83,6 @@
       [self logWithFormat:@"Note: got no uid for email: '%@'", email];
       continue;
     }
-    if ([uid hasPrefix:@"mailto:"])
-      uid = [uid substringFromIndex:7];
-
     if (![uids containsObject:uid])
       [uids addObject:uid];
   }