From a12e6fe5293d5027509c46cb05d8a81b87bf8511 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 9 May 2007 19:30:06 +0000
Subject: [PATCH] Monotone-Parent: 1471bacc37d4bfc7718c85c0760024d89c4440ef
 Monotone-Revision: 34df2ce95db78b6833565a16c9535dea4b46e0b6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:30:06
Monotone-Branch: ca.inverse.sogo
---
 .../Appointments/SOGoCalendarComponent.m      |  2 +-
 SoObjects/Appointments/SOGoFreeBusyObject.m   |  2 +-
 SoObjects/Contacts/SOGoContactLDIFEntry.m     | 38 +++++++++----------
 UI/Scheduler/UIxComponent+Scheduler.m         |  6 ++-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 141c36a94..9e8c841e6 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -316,7 +316,7 @@ static BOOL sendEMailNotifications = NO;
 
   uid = [[LDAPUserManager sharedUserManager] getUIDForEmail: email];
 
-  return [[SOGoUser userWithLogin: uid andRoles: nil] timeZone];
+  return [[SOGoUser userWithLogin: uid roles: nil] timeZone];
 }
 
 - (void) sendEMailUsingTemplateNamed: (NSString *) _pageName
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index e10083c27..c13a2c381 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -22,6 +22,7 @@
 
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalFreeBusy.h>
+#import <NGCards/iCalPerson.h>
 
 #import "common.h"
 
@@ -131,7 +132,6 @@
                                      from: (NSCalendarDate *) _startDate
                                        to: (NSCalendarDate *) _endDate
 {
-  LDAPUserManager *um;
   NSString *uid;
   NSEnumerator *events;
   iCalCalendar *calendar;
diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.m b/SoObjects/Contacts/SOGoContactLDIFEntry.m
index 21d206b73..22a2ba7ef 100644
--- a/SoObjects/Contacts/SOGoContactLDIFEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDIFEntry.m
@@ -81,23 +81,23 @@
 {
   NSString *info;
 
-  info = [ldifEntry valueForKey: @"telephoneNumber"];
+  info = [ldifEntry objectForKey: @"telephoneNumber"];
   if (info)
     [vCard addTel: info
            types: [NSArray arrayWithObjects: @"work", @"voice", @"pref", nil]];
-  info = [ldifEntry valueForKey: @"homePhone"];
+  info = [ldifEntry objectForKey: @"homePhone"];
   if (info)
     [vCard addTel: info
            types: [NSArray arrayWithObjects: @"home", @"voice", nil]];
-  info = [ldifEntry valueForKey: @"fax"];
+  info = [ldifEntry objectForKey: @"fax"];
   if (info)
     [vCard addTel: info
            types: [NSArray arrayWithObjects: @"work", @"fax", nil]];
-  info = [ldifEntry valueForKey: @"pager"];
+  info = [ldifEntry objectForKey: @"pager"];
   if (info)
     [vCard addTel: info
            types: [NSArray arrayWithObjects: @"pager", nil]];
-  info = [ldifEntry valueForKey: @"mobile"];
+  info = [ldifEntry objectForKey: @"mobile"];
   if (info)
     [vCard addTel: info
            types: [NSArray arrayWithObjects: @"cell", @"voice", nil]];
@@ -121,37 +121,37 @@
       [vcard setVClass: @"PUBLIC"];
       [vcard setProdID: @"-//OpenGroupware.org//SOGo"];
       [vcard setProfile: @"vCard"];
-      info = [ldifEntry valueForKey: @"displayName"];
+      info = [ldifEntry objectForKey: @"displayName"];
       if (!(info && [info length] > 0))
-        info = [ldifEntry valueForKey: @"cn"];
+        info = [ldifEntry objectForKey: @"cn"];
       [vcard setFn: info];
-      surname = [ldifEntry valueForKey: @"sn"];
+      surname = [ldifEntry objectForKey: @"sn"];
       if (!surname)
-        surname = [ldifEntry valueForKey: @"surname"];
+        surname = [ldifEntry objectForKey: @"surname"];
       [vcard setNWithFamily: surname
-             given: [ldifEntry valueForKey: @"givenName"]
+             given: [ldifEntry objectForKey: @"givenName"]
              additional: nil
              prefixes: nil
              suffixes: nil];
-      info = [ldifEntry valueForKey: @"title"];
+      info = [ldifEntry objectForKey: @"title"];
       if (info)
         [vcard setTitle: info];
-      info = [ldifEntry valueForKey: @"mozillaNickname"];
+      info = [ldifEntry objectForKey: @"mozillaNickname"];
       if (info)
         [vcard setNickname: info];
-      info = [ldifEntry valueForKey: @"xmozillaNickname"];
+      info = [ldifEntry objectForKey: @"xmozillaNickname"];
       if (info)
         [vcard setNickname: info];
-      info = [ldifEntry valueForKey: @"notes"];
+      info = [ldifEntry objectForKey: @"notes"];
       if (info)
         [vcard setNote: info];
-      info = [ldifEntry valueForKey: @"mail"];
+      info = [ldifEntry objectForKey: @"mail"];
       if (info)
         [vcard addEmail: info
                types: [NSArray arrayWithObjects: @"internet", @"pref", nil]];
       [self _setPhonesOfVCard: vcard];
-      streetAddress = [ldifEntry valueForKey: @"streetAddress"];
-      location = [ldifEntry valueForKey: @"l"];
+      streetAddress = [ldifEntry objectForKey: @"streetAddress"];
+      location = [ldifEntry objectForKey: @"l"];
       element = [CardElement elementWithTag: @"adr"
                              attributes: nil values: nil];
       [element setValue: 0 ofAttribute: @"type" to: @"work"];
@@ -161,7 +161,7 @@
         [element setValue: 3 to: location];
       if (streetAddress || location)
         [vcard addChild: element];
-      info = [ldifEntry valueForKey: @"calFBURL"];
+      info = [ldifEntry objectForKey: @"calFBURL"];
       if (info)
         [vcard addChildWithTag: @"FBURL"
                types: nil
@@ -173,7 +173,7 @@
 
 - (NSString *) davEntityTag
 {
-  return [ldifEntry valueForKey: @"modifyTimeStamp"];
+  return [ldifEntry objectForKey: @"modifyTimeStamp"];
 }
 
 - (NSString *) davContentType
diff --git a/UI/Scheduler/UIxComponent+Scheduler.m b/UI/Scheduler/UIxComponent+Scheduler.m
index 26dc48215..46b92548c 100644
--- a/UI/Scheduler/UIxComponent+Scheduler.m
+++ b/UI/Scheduler/UIxComponent+Scheduler.m
@@ -19,9 +19,11 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
 #import <SoObjects/Appointments/SOGoCalendarComponent.h>
-#import <SoObjects/SOGo/WOContext+Agenor.h>
-#import <SoObjects/SOGo/SOGoUser.h>
 
 #import "UIxComponent+Scheduler.h"