From 231d4151a7de7a6806e5d98a04c0725eaefba032 Mon Sep 17 00:00:00 2001 From: rfm Date: Mon, 26 Nov 2007 09:14:52 +0000 Subject: [PATCH] Make test for apple property lists more tolerant. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25612 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/Additions/GSXML.m | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 402d97736..a69e88688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-26 Richard Frith-Macdonald + + * Source/Additions/GSXML.m: Make check for apple property lists + more tolerant. + 2007-11-25 Richard Frith-Macdonald * Headers/Foundation/NSThread.h: Add new methods from MacOS 10.5 diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m index d58758d1a..eb54032c4 100644 --- a/Source/Additions/GSXML.m +++ b/Source/Additions/GSXML.m @@ -2391,11 +2391,6 @@ static NSString *endMarker = @"At end of incremental parse"; */ #define HANDLER ((GSSAXHandler*)(((xmlParserCtxtPtr)ctx)->_private)) -#ifdef GNUSTEP -static NSString *applePList - = @"file://localhost/System/Library/DTDs/PropertyList.dtd"; -#endif - static xmlParserInputPtr loadEntityFunction(void *ctx, const unsigned char *eid, const unsigned char *url) @@ -2440,7 +2435,7 @@ loadEntityFunction(void *ctx, range: NSMakeRange(0, [local length])]; #ifdef GNUSTEP - if ([location isEqual: applePList] == YES) + if ([location rangeOfString: @"/DTDs/PropertyList"].length > 0) { file = [location substringFromIndex: 6]; if ([[NSFileManager defaultManager] fileExistsAtPath: file] == NO)