Monotone-Parent: 6b671acbd7feafaefa796eb983a298d042a67053

Monotone-Revision: 66f2305131d36e0c071297f37ef233e6f1db816f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-09T16:30:48
Monotone-Branch: ca.inverse.sogo

SOPE/NGCards/CardGroup.m

@@ -43,10 +43,15 @@ static NGCardsSaxHandler *sax = nil;
   
   if (!parser)
     {
+#if 1
+      parser = [[SaxXMLReaderFactory standardXMLReaderFactory]
+                 createXMLReaderWithName: @"VSCardSaxDriver"];
+      [parser retain];
+#else
       parser =
         [[[SaxXMLReaderFactory standardXMLReaderFactory] 
-           createXMLReaderForMimeType:@"text/x-vcard"]
-          retain];
+           createXMLReaderForMimeType:@"text/x-vcard"] retain];
+#endif
       if (parser)
         {
           [parser setContentHandler:sax];

SOPE/NGCards/ChangeLog

@@ -1,3 +1,10 @@
+2007-02-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* CardGroup.m ([CardGroup +cardParser]): find the correct parser
+	by requesting a parser by name instead of by mime-type. This way,
+	any parser which would declare the same types would not
+	enter in conflict.
+
 2007-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* CardElement.m ([CardElement -namedValue:aValueName]): use

SOPE/NGCards/versitCardsSaxDriver/GNUmakefile

@@ -8,7 +8,7 @@ BUNDLE_NAME        = versitCardsSaxDriver
 BUNDLE_EXTENSION   = .sax
 BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
-versitCardsSaxDriver_PRINCIPAL_CLASS = VSSaxDriver
+versitCardsSaxDriver_PRINCIPAL_CLASS = VSCardSaxDriver
 
 versitCardsSaxDriver_PCH_FILE = common.h