Fixup code locatting user domain library directory.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24777 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-03-06 06:17:14 +00:00
parent 4c3b12c83a
commit 2e58ecd05e
3 changed files with 14 additions and 9 deletions

View file

@ -1,8 +1,15 @@
2007-03-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSServicesManager.m:
* Source/NSWorkspace.m:
Fix usage of NSSearchPathForDirectoriesInDomains() to match new
filesystem support changes.
2007-03-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSSpellServer.m: deleted
* Source/GNUmakefile: remove NSSpellServer.m
* Source/NSSpellChecker.m: include NSSpellServer.h fro base
* Source/NSSpellChecker.m: include NSSpellServer.h from base
* Headers/AppKit/NSSpellServer.h: deleted
* Headers/AppKit/AppKit.h remove NSSpellServer.h
Moved NSSpellServer to base for macos-x compatibility.

View file

@ -521,9 +521,9 @@ static NSString *disabledName = @".GNUstepDisabled";
manager = [GSServicesManager alloc];
str = [NSSearchPathForDirectoriesInDomains(NSUserDirectory,
str = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSUserDomainMask, YES) objectAtIndex: 0];
str = [str stringByAppendingPathComponent: @"Library/Services"];
str = [str stringByAppendingPathComponent: @"Services"];
path = [str stringByAppendingPathComponent: servicesName];
manager->_servicesPath = [path copy];
path = [str stringByAppendingPathComponent: disabledName];

View file

@ -524,17 +524,15 @@ static NSString *_rootPath = @"/";
NS_DURING
{
service = [[NSSearchPathForDirectoriesInDomains(NSUserDirectory,
NSUserDomainMask,
YES)
objectAtIndex: 0]
stringByAppendingPathComponent: @"Library/Services"];
service = [[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSUserDomainMask, YES) objectAtIndex: 0]
stringByAppendingPathComponent: @"Services"];
/*
* Load file extension preferences.
*/
extPrefPath = [service
stringByAppendingPathComponent: @".GNUstepExtPrefs"];
stringByAppendingPathComponent: @".GNUstepExtPrefs"];
RETAIN(extPrefPath);
if ([mgr isReadableFileAtPath: extPrefPath] == YES)
{