diff --git a/SOPE/NGCards/CardGroup.m b/SOPE/NGCards/CardGroup.m index 90700c8ae..b7b60ca71 100644 --- a/SOPE/NGCards/CardGroup.m +++ b/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]; diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 5dc47b5eb..e5dea6615 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,10 @@ +2007-02-09 Wolfgang Sourdeau + + * 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 * CardElement.m ([CardElement -namedValue:aValueName]): use diff --git a/SOPE/NGCards/versitCardsSaxDriver/GNUmakefile b/SOPE/NGCards/versitCardsSaxDriver/GNUmakefile index 82c2d316d..0782266b8 100644 --- a/SOPE/NGCards/versitCardsSaxDriver/GNUmakefile +++ b/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