Monotone-Parent: 10b56ee326ca77f71fbe5cb41d30b0640a6fe57a

Monotone-Revision: 494c37e329faf06b93265c155db7226d205150b0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-09-13T21:20:57
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactEditorBase.h

@@ -28,7 +28,6 @@
 
 @interface UIxContactEditorBase : UIxComponent
 {
-  NSString *contentString;
   NSString *errorText;
   NSString *anaisCN;
   NSMutableDictionary *snapshot; /* contains the values for editing */

UI/Contacts/UIxContactEditorBase.m

@@ -38,25 +38,11 @@
   [self->snapshot      release];
   [self->anaisCN      release];
   [self->errorText     release];
-  [self->contentString release];
   [super dealloc];
 }
 
 /* accessors */
 
-- (void)setContentString:(NSString *)_cstr
-{
-  ASSIGNCOPY(self->contentString, _cstr);
-}
-
-- (NSString *)contentString {
-  return self->contentString;
-}
-
-- (NSString *)contentStringTemplate {
-  return @"{}"; /* empty property list */
-}
-
 - (NSMutableDictionary *) snapshot
 {
   NSString *email;
@@ -92,24 +78,6 @@
 
 /* load/store content format */
 
-- (void)loadValuesFromContentString:(NSString *)_s {
-  NSDictionary *plist;
-
-  if ([_s hasPrefix:@"BEGIN:VCARD"]) {
-    // TODO: load vCard values
-    [self errorWithFormat:@"Editing of vCard's is not yet supported!"];
-    return;
-  }
-  
-  if ((plist = [_s propertyList]) == nil) {
-    [self errorWithFormat:@"could not parse content string!"];
-    return;
-  }
-  
-  [self->snapshot removeAllObjects];
-  [self->snapshot addEntriesFromDictionary:plist];
-}
-
 - (void)_fixupSnapshot {
   // TODO: perform sanity checking, eg build CN on demand
   NSString *cn, *gn, *sn;

UI/MailPartViewers/UIxMailPartICalViewer.m

@@ -51,7 +51,7 @@
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SoObjects/Appointments/SOGoAppointmentObject.h>
 #include <SoObjects/Mailer/SOGoMailObject.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGImap4/NGImap4EnvelopeAddress.h>
 #include "common.h"
 

UI/Scheduler/UIxAppointmentEditor.m

@@ -88,7 +88,7 @@
 @end
 
 #include "common.h"
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGExtensions/NGCalendarDateRange.h>
 #include <SOGoUI/SOGoDateFormatter.h>
 #include <SOGo/SOGoAppointment.h>
@@ -103,7 +103,7 @@
 @end
 
 @interface NSDate(UsedPrivates)
-- (NSString *)icalString; // TODO: this is in NGiCal
+- (NSString *)icalString; // TODO: this is in NGCards
 @end
 
 @implementation UIxAppointmentEditor

UI/Scheduler/UIxAppointmentProposal.m

@@ -57,7 +57,7 @@
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SoObjects/Appointments/SOGoFreeBusyObject.h>
 #include <NGExtensions/NGCalendarDateRange.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "common.h"
 
 @implementation UIxAppointmentProposal

UI/Scheduler/UIxAppointmentView.m

@@ -20,7 +20,7 @@
 */
 
 #include "UIxAppointmentView.h"
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <SOGo/SOGoAppointment.h>
 #include <SOGo/WOContext+Agenor.h>
 #include <Appointments/SOGoAppointmentObject.h>

UI/Scheduler/UIxCalDateLabel.m

@@ -37,7 +37,7 @@
 @end
 
 #include "common.h"
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 
 @implementation UIxCalDateLabel
 

UI/Scheduler/UIxCalParticipationStatusView.m

@@ -31,7 +31,7 @@
 
 @end
 
-#include <NGiCal/NGiCal.h> /* for iCalPersonPartStat */
+#include <NGCards/NGCards.h> /* for iCalPersonPartStat */
 #include "common.h"
 
 @implementation UIxCalParticipationStatusView

UI/Scheduler/UIxCalView.m

@@ -7,7 +7,7 @@
 #include <NGObjWeb/SoUser.h>
 #include <SOGoUI/SOGoAptFormatter.h>
 #include <NGExtensions/NGCalendarDateRange.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "UIxComponent+Agenor.h"
 
 @interface UIxCalView (PrivateAPI)

UI/Scheduler/iCalPerson+UIx.h

@@ -23,7 +23,7 @@
 #ifndef __iCalPerson_UIx_H__
 #define __iCalPerson_UIx_H__
 
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 
 @class NSString;
 

UI/Scheduler/iCalRecurrenceRule+SOGo.m

@@ -19,7 +19,7 @@
   02111-1307, USA.
 */
 
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "common.h"
 
 /* HACK ALERT

UI/common.make

@@ -43,6 +43,6 @@ BUNDLE_LIBS += \
 	-lGDLContentStore			\
 	-lGDLAccess				\
 	-lNGObjWeb				\
-	-lNGMime -lNGiCal -lNGLdap		\
+	-lNGMime -lNGCards -lNGLdap		\
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lXmlRpc -lDOM -lSaxObjC