From 3dea0ac8d5cccaf15ece94b0b3c45c7e1fbc58e7 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 9 Feb 2007 16:30:48 +0000 Subject: [PATCH] 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 | 9 +++++++-- SOPE/NGCards/ChangeLog | 7 +++++++ SOPE/NGCards/versitCardsSaxDriver/GNUmakefile | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) 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