Monotone-Parent: 10b56ee326ca77f71fbe5cb41d30b0640a6fe57a

Monotone-Revision: 494c37e329faf06b93265c155db7226d205150b0

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

Main/GNUmakefile.preamble

@@ -21,7 +21,7 @@ $(SOGOD)_TOOL_LIBS += \
 	-lGDLContentStore	\
 	-lGDLAccess		\
 	-lWEExtensions		\
-	-lNGiCal		\
+	-lNGCards		\
 	-lNGObjWeb		\
 	-lNGMime -lNGLdap	\
 	-lNGStreams -lNGExtensions -lEOControl \

OGoContentStore/GNUmakefile.preamble

@@ -3,7 +3,7 @@
 libOGoContentStore_LIBRARIES_DEPEND_UPON += \
 	-lGDLContentStore	\
 	-lGDLAccess	\
-	-lNGiCal	\
+	-lNGCards	\
 	-lNGExtensions	\
 	-lEOControl	\
 	-lSaxObjC
@@ -24,7 +24,7 @@ test_quick_extract_TOOL_LIBS += \
 	-lSaxObjC		\
 	-lDOM			\
 	-lNGExtensions		\
-	-lNGiCal		\
+	-lNGCards		\
 	-lGDLContentStore	\
 	-lGDLAccess		\
 	-lOGoContentStore

OGoContentStore/OCSContactFieldExtractor.m

@@ -24,7 +24,7 @@
 @interface OCSContactFieldExtractor : GCSFieldExtractor
 @end
 
-#include <NGiCal/NGVCard.h>
+#include <NGCards/NGVCard.h>
 #include "common.h"
 
 @implementation OCSContactFieldExtractor

OGoContentStore/OCSiCalFieldExtractor.m

@@ -22,7 +22,7 @@
 #include "OCSiCalFieldExtractor.h"
 #include "common.h"
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include "iCalEntityObject+OCS.h"
 #include "iCalRepeatableEntityObject+OCS.h"
 
@@ -45,7 +45,7 @@ static NSNumber                  *distantFutureNumber = nil;
 	        retain];
   if (parser == nil)
     NSLog(@"ERROR: did not find a parser for text/calendar!");
-  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
   if (sax == nil)
       NSLog(@"ERROR: could not create the iCal SAX handler!");
   [parser setContentHandler:sax];

OGoContentStore/iCalRepeatableEntityObject+OCS.h

@@ -24,7 +24,7 @@
 #ifndef	__OGoContentStore_iCalRepeatableEntityObject_OCS_H_
 #define	__OGoContentStore_iCalRepeatableEntityObject_OCS_H_
 
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 
 @interface iCalRepeatableEntityObject (OCS)
 

Protocols/common.make

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

Protocols/iCalHTTP/SOGoICalFilePublish.m

@@ -31,8 +31,8 @@
 #include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SoObjects/Appointments/SOGoAppointmentObject.h>
 #include <SOGo/SOGoAppointment.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
-#include <NGiCal/iCalRenderer.h>
+#include <NGCards/iCalRenderer.h>
 #include <SaxObjC/SaxObjC.h>
 #include "common.h"
 
@@ -51,7 +51,7 @@ static SaxObjectDecoder          *sax   = nil;
       NSLog(@"ERROR: did not find a parser for text/calendar!");
   }
   if (sax == nil) {
-    sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+    sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
     if (sax == nil)
       NSLog(@"ERROR: could not create the iCal SAX handler!");
   }

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -25,7 +25,7 @@
 #include <SOGo/AgenorUserManager.h>
 #include <GDLContentStore/GCSFolder.h>
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGExtensions/NGCalendarDateRange.h>
 #include "common.h"
 

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -23,7 +23,7 @@
 #include <SOGo/AgenorUserManager.h>
 #include <SOGo/SOGoAppointment.h>
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <NGMime/NGMime.h>
 #include <NGMail/NGMail.h>
 #include <NGMail/NGSendMail.h>
@@ -78,7 +78,7 @@ static NSString                  *mailTemplateDefaultLanguage = nil;
     retain];
   if (parser == nil)
     [logger fatalWithFormat:@"did not find a parser for text/calendar!"];
-  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
   if (sax == nil)
     [logger fatalWithFormat:@"could not create the iCal SAX handler!"];
   

SoObjects/Appointments/SOGoFreeBusyObject.m

@@ -23,11 +23,11 @@
 #include "SOGoFreeBusyObject.h"
 #include "common.h"
 #include <SOGo/AgenorUserManager.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
-#include <NGiCal/iCalRenderer.h>
+#include <NGCards/iCalRenderer.h>
 
 @interface NSDate(UsedPrivates)
-- (NSString *)icalString; // declared in NGiCal
+- (NSString *)icalString; // declared in NGCards
 @end
 
 @interface SOGoFreeBusyObject (PrivateAPI)

SoObjects/Contacts/GNUmakefile

@@ -17,8 +17,6 @@ Contacts_OBJC_FILES =			\
 					\
 	NSDictionary+Contact.m		\
 	NGLdapEntry+Contact.m		\
-	NGVCard+Contact.m		\
-	NGVCardSimpleValue+Contact.m	\
 
 Contacts_RESOURCE_FILES +=		\
 	Version				\

SoObjects/SOGo/SOGoAppointment.m

@@ -21,7 +21,7 @@
 
 #include "SOGoAppointment.h"
 #include <SaxObjC/SaxObjC.h>
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
 #include <EOControl/EOControl.h>
 #include "SOGoAppointmentICalRenderer.h"
 #include "common.h"
@@ -52,7 +52,7 @@ static NGLogger                  *logger = nil;
     retain];
   if (parser == nil)
     [logger fatalWithFormat:@"did not find a parser for text/calendar!"];
-  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGiCal"];
+  sax = [[SaxObjectDecoder alloc] initWithMappingNamed:@"NGCards"];
   if (sax == nil)
     [logger fatalWithFormat:@"could not create the iCal SAX handler!"];
   
@@ -422,8 +422,8 @@ static NGLogger                  *logger = nil;
 
 
 /*
- NOTE: this is not the same API as used by NGiCal!
+ NOTE: this is not the same API as used by NGCards!
- SOGo/OGo cannot deal with the complete NGiCal API properly, although
+ SOGo/OGo cannot deal with the complete NGCards API properly, although
  SOGo COULD do so in the future
 */
 - (void)setRecurrenceRule:(iCalRecurrenceRule *)_rrule {

SoObjects/SOGo/SOGoAppointmentICalRenderer.m

@@ -21,14 +21,14 @@
 
 #include "SOGoAppointmentICalRenderer.h"
 #include "SOGoAppointment.h"
-#include <NGiCal/NGiCal.h>
+#include <NGCards/NGCards.h>
-#include <NGiCal/iCalRenderer.h>
+#include <NGCards/iCalRenderer.h>
 #include "common.h"
 
-// TODO: the basic renderer should be part of NGiCal
+// TODO: the basic renderer should be part of NGCards
 
 @interface NSDate(UsedPrivates)
-- (NSString *)icalString; // declared in NGiCal
+- (NSString *)icalString; // declared in NGCards
 @end
 
 @implementation SOGoAppointmentICalRenderer

SoObjects/common.make

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

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