From ca2a19fc5b41017318eab52c29bbdfb5e5585809 Mon Sep 17 00:00:00 2001 From: gcasa Date: Wed, 3 Dec 2008 22:19:36 +0000 Subject: [PATCH] * Source/NSDocumentController.m: Fixed fileExtensionFromType:, bug #24894 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27205 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSDocumentController.m | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20af88f09..79204a70e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-03 17:23-EST Gregory John Casamento + + * Source/NSDocumentController.m: Fixed fileExtensionFromType:, + bug #24894 + 2008-12-03 01:38-EST Gregory John Casamento * Source/GSInfoPanel.m: -[GSInfoPanel initWithDictionary:] diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m index 678844586..f13a52247 100644 --- a/Source/NSDocumentController.m +++ b/Source/NSDocumentController.m @@ -1001,10 +1001,14 @@ static NSDictionary *TypeInfoForHumanReadableName (NSArray *types, NSString *typ NSDictionary *typeInfo = TYPE_INFO(type); NSArray *unixExtensions = [typeInfo objectForKey: NSUnixExtensionsKey]; NSArray *dosExtensions = [typeInfo objectForKey: NSDOSExtensionsKey]; - + NSArray *cfFileExtensions = [typeInfo objectForKey: CFBundleTypeExtensions]; + + if (!dosExtensions && !unixExtensions) return cfFileExtensions; if (!dosExtensions) return unixExtensions; if (!unixExtensions) return dosExtensions; - return [unixExtensions arrayByAddingObjectsFromArray: dosExtensions]; + + return [[unixExtensions arrayByAddingObjectsFromArray: dosExtensions] + arrayByAddingObjectsFromArray: cfFileExtensions]; } - (Class) documentClassForType: (NSString *)type