From 9b9521703e1240479e157048c6859f55c4dbabb0 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 3 Nov 2006 19:39:54 +0000
Subject: [PATCH] Monotone-Parent: cd8296d46bb1d0a2657836c7d9b185a97c8a2bf2
 Monotone-Revision: 10edd440c92ffe461411fef30ac170659d6adb56

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-03T19:39:54
Monotone-Branch: ca.inverse.sogo
---
 UI/Contacts/UIxContactsListViewContainer.m | 11 ++++++++++-
 UI/Scheduler/UIxCalMonthView.m             |  2 +-
 UI/Scheduler/UIxComponentEditor.h          | 21 +++++++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainer.m
index 71c96ef0d..b6e218f67 100644
--- a/UI/Contacts/UIxContactsListViewContainer.m
+++ b/UI/Contacts/UIxContactsListViewContainer.m
@@ -145,7 +145,16 @@
 
 - (NSArray *) additionalFolders
 {
-  return [[self additionalAddressBooks] componentsSeparatedByString: @","];
+  NSString *folders;
+  NSArray *folderNames;
+
+  folders = [self additionalAddressBooks];
+  if ([folders length] > 0)
+    folderNames = [folders componentsSeparatedByString: @","];
+  else
+    folderNames = nil;
+
+  return folderNames;
 }
 
 - (void) setCurrentAdditionalFolder: (NSString *) newCurrentAdditionalFolder
diff --git a/UI/Scheduler/UIxCalMonthView.m b/UI/Scheduler/UIxCalMonthView.m
index a1f1f9f18..a52064e5d 100644
--- a/UI/Scheduler/UIxCalMonthView.m
+++ b/UI/Scheduler/UIxCalMonthView.m
@@ -93,7 +93,7 @@
     {
       [self _addEventToSortedEvents: currentEvent];
       currentEvent = [events nextObject];
-      NSLog (@"event:\n'%@'", currentEvent);
+//       NSLog (@"event:\n'%@'", currentEvent);
     }
 
   return self;
diff --git a/UI/Scheduler/UIxComponentEditor.h b/UI/Scheduler/UIxComponentEditor.h
index fbf594e10..4e256a59b 100644
--- a/UI/Scheduler/UIxComponentEditor.h
+++ b/UI/Scheduler/UIxComponentEditor.h
@@ -52,21 +52,15 @@
   NSArray *participants;     /* array of iCalPerson's */
   NSArray *resources;        /* array of iCalPerson's */
   NSString *priority;
+  NSString *privacy;
+  NSString *status;
   NSArray *categories;
-  NSString *accessClass;
-  BOOL isPrivate;         /* default: NO */
   BOOL checkForConflicts; /* default: NO */
   NSDictionary *cycle;
   NSString *cycleEnd;
   NSString *componentOwner;
 }
 
-- (void) setAccessClass: (NSString *) _class;
-- (NSString *) accessClass;
-
-- (void) setIsPrivate: (BOOL) _yn;
-- (BOOL) isPrivate;
-
 - (NSArray *) categoryItems;
 - (void) setCategories: (NSArray *) _categories;
 - (NSArray *) categories;
@@ -75,6 +69,17 @@
 - (NSArray *) priorities;
 - (void) setPriority: (NSString *) _priority;
 - (NSString *) priority;
+- (NSString *) itemPriorityText;
+
+- (NSArray *) privacyClasses;
+- (void) setPrivacy: (NSString *) _privacy;
+- (NSString *) privacy;
+- (NSString *) itemPrivacyText;
+
+- (NSArray *) statusTypes;
+- (void) setStatus: (NSString *) _status;
+- (NSString *) status;
+- (NSString *) itemStatusText;
 
 - (void) setItem: (id) _item;
 - (id) item;