gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix default defaults directory for users other than the current one.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21844 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2005-10-19 05:52:48 +00:00
parent 7b4766b748
commit ec9a5e0dc9
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Source/NSPathUtilities.m
View file

@ -170,6 +170,9 @@ static NSString *localResources = nil;
static NSString *localApps = nil;
static NSString *localLibs = nil;
static NSString *defaultUserDir = @"GNUstep";
static NSString *defaultUserDefaultsDir = @"GNUstep/Defaults";
/* Keys for Platform support in conf-file. */
#define SYS_APPS @"SYS_APPS"
#define SYS_LIBS @"SYS_LIBS"
@ -302,11 +305,11 @@ static void ExtractValuesFromConfig(NSDictionary *config)
*/
if (gnustepUserDir == nil)
{
ASSIGN(gnustepUserDir, @"GNUstep");
ASSIGN(gnustepUserDir, defaultUserDir);
}
if (gnustepUserDefaultsDir == nil)
{
ASSIGN(gnustepUserDefaultsDir, @"GNUstep/Defaults");
ASSIGN(gnustepUserDefaultsDir, defaultUserDefaultsDir);
}
/*
* Set the user root from the user home and the user dir
@ -1226,7 +1229,7 @@ NSString *
GSDefaultsRootForUser(NSString *userName)
{
NSString *home;
NSString *defaultsDir = nil;
NSString *defaultsDir;
InitialisePathUtilities();
if ([userName length] == 0)
@ -1244,6 +1247,10 @@ GSDefaultsRootForUser(NSString *userName)
config = GNUstepUserConfig(userName);
defaultsDir = [config objectForKey: @"GNUSTEP_USER_DEFAULTS_DIR"];
if (defaultsDir == nil)
{
defaultsDir = defaultUserDefaultsDir;
}
}
home = [home stringByAppendingPathComponent: defaultsDir];