From 2cf97deea291fee16fd16efe57e196c059022776 Mon Sep 17 00:00:00 2001 From: dwetzel Date: Mon, 16 Sep 2002 23:49:06 +0000 Subject: [PATCH] search Bundles too git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@14467 72102866-910b-0410-8b05-ffd578937521 --- GSWeb.framework/GSWResourceManager.m | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/GSWeb.framework/GSWResourceManager.m b/GSWeb.framework/GSWResourceManager.m index cfa80d7..9e1ab12 100644 --- a/GSWeb.framework/GSWResourceManager.m +++ b/GSWeb.framework/GSWResourceManager.m @@ -1045,7 +1045,7 @@ NSString* localNotFoundMarker=@"NOTFOUND"; { // NSDebugMLLog(@"resmanager",@"frameworkName=%@",frameworkName); bundle=[self lockedCachedBundleForFrameworkNamed:frameworkName]; - NSDebugMLLog(@"resmanager",@"bundle=%@",bundle); + //NSDebugMLLog(@"resmanager",@"bundle=%@",bundle); if (bundle) { // NSDebugMLLog(@"resmanager",@"found cached bundle=%@",bundle); @@ -1095,13 +1095,17 @@ NSString* localNotFoundMarker=@"NOTFOUND"; // NSDebugMLLog(@"resmanager",@"bundle %@ %s cached",resourceName,(bundle ? "" : "NOT")); if (!bundle) { - NSArray* allFrameworks=[NSBundle allFrameworks]; + NSMutableArray* allFrameworks=[[NSBundle allFrameworks] mutableCopy]; int i=0; NSString* bundlePath=nil; NSBundle* tmpBundle=nil; NSDictionary* infoDict=nil; NSString* frameworkName=nil; GSWDeployedBundle* projectBundle=nil; + + [allFrameworks addObjectsFromArray:[NSBundle allBundles]]; + [allFrameworks autorelease]; + for(i=0;!bundle && i<[allFrameworks count];i++) { tmpBundle=[allFrameworks objectAtIndex:i]; @@ -1290,7 +1294,7 @@ NSString* localNotFoundMarker=@"NOTFOUND"; } else frameworks=[NSArray arrayWithObject:aFrameworkName ? aFrameworkName : @""]; - + for(i=0;!path && i<[frameworks count];i++) { frameworkName=[frameworks objectAtIndex:i];