From 43997f992f95fc7339ea51dd4c17b152ac3cfdb7 Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Sat, 15 May 2004 04:04:51 +0000 Subject: [PATCH] Conform to documentation git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@19334 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 3 +++ Source/NSDocumentController.m | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74fdcd1d3..6fc608d17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-05-14 Adam Fedor + * Source/NSDocumentController.m ([NSDocumentController -currentDirectory]): + Conform to the documentation. (Fixes #7900). + * Tools/gsnd/gsnd.m: Rename variables starting with _, indent lines properly (Fixes #7502). diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m index 5a889dc62..08d122b45 100644 --- a/Source/NSDocumentController.m +++ b/Source/NSDocumentController.m @@ -611,13 +611,11 @@ static NSDictionary *TypeInfoForName (NSArray *types, NSString *typeName) NSString *directory; BOOL isDir = NO; - if (document == nil) - document = [[self documents] lastObject]; - directory = [[document fileName] stringByDeletingLastPathComponent]; - if (directory == nil) - directory = [[NSUserDefaults standardUserDefaults] - objectForKey: NSDefaultOpenDirectory]; - if (directory == nil + if (document) + directory = [[document fileName] stringByDeletingLastPathComponent]; + else + directory = [[NSOpenPanel openPanel] directory]; + if (directory == nil || [directory isEqual: @""] || [manager fileExistsAtPath: directory isDirectory: &isDir] == NO || isDir == NO) {