Bugfix for resource location.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@21997 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-11-13 09:10:31 +00:00
parent ec0d95b96f
commit e57534e771
2 changed files with 8 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2005-11-13 Richard Frith-Macdonald <rfm@gnu.org>
* GormCore/GormFunctions.m: Use NSSearchPathForDirectoriesInDomains()
to locate resources rather than broken use of NSOpenStepRootDirectory()
2005-11-12 16:32 Gregory John Casamento <greg_casamento@yahoo.com> 2005-11-12 16:32 Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormClassManager.m * GormCore/GormClassManager.m

View file

@ -225,8 +225,8 @@ NSDictionary *colorToDict(NSColor *color)
NSArray *systemImagesList() NSArray *systemImagesList()
{ {
NSString *system = [NSOpenStepRootDirectory() stringByAppendingPathComponent: @"System"]; NSString *lib = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask) lastObject];
NSString *lib = [system stringByAppendingPathComponent: @"Library"];
NSString *path = [lib stringByAppendingPathComponent: @"Images"]; NSString *path = [lib stringByAppendingPathComponent: @"Images"];
NSArray *contents = [[NSFileManager defaultManager] directoryContentsAtPath: path]; NSArray *contents = [[NSFileManager defaultManager] directoryContentsAtPath: path];
NSEnumerator *en = [contents objectEnumerator]; NSEnumerator *en = [contents objectEnumerator];
@ -248,8 +248,7 @@ NSArray *systemImagesList()
NSArray *systemSoundsList() NSArray *systemSoundsList()
{ {
NSString *system = [NSOpenStepRootDirectory() stringByAppendingPathComponent: @"System"]; NSString *lib = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSSystemDomainMask) lastObject];
NSString *lib = [system stringByAppendingPathComponent: @"Library"];
NSString *path = [lib stringByAppendingPathComponent: @"Sounds"]; NSString *path = [lib stringByAppendingPathComponent: @"Sounds"];
NSArray *contents = [[NSFileManager defaultManager] directoryContentsAtPath: path]; NSArray *contents = [[NSFileManager defaultManager] directoryContentsAtPath: path];
NSEnumerator *en = [contents objectEnumerator]; NSEnumerator *en = [contents objectEnumerator];