Tidied defaults usage with ports

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22068 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-11-22 06:30:51 +00:00
parent 0814e1b8ad
commit e8a16aaeb8
5 changed files with 34 additions and 40 deletions

View file

@ -1,3 +1,13 @@
2005-11-22 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPort.m:
* Source/NSMessagePort.m:
* Source/NSDistributedNotificationCenter.m:
* Tools/gdnc.m:
Use the NSPortIsMessagePort user default consistently to control
whether socket or message ports are used by default. Remove mingw32
sp[ecific GSMailslot user default.
2005-11-20 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Add flags to allow detection of headers/libraries

View file

@ -588,18 +588,19 @@ static NSDistributedNotificationCenter *netCenter = nil;
Protocol *p = @protocol(GDNCProtocol);
NSConnection *c;
#ifdef __MINGW32__
if (_type == NSLocalNotificationCenterType
&& [[NSUserDefaults standardUserDefaults]
boolForKey: @"GSMailslot"] == NO)
{
ASSIGN(_type, GSPublicNotificationCenterType);
}
#endif
if (_type == NSLocalNotificationCenterType)
{
ns = [NSMessagePortNameServer sharedInstance];
NSUserDefaults *defs = [NSUserDefaults standardUserDefaults];
if ([defs objectForKey: @"NSPortIsMessagePort"] != nil
&& [defs boolForKey: @"NSPortIsMessagePort"] == NO)
{
ns = [NSSocketPortNameServer sharedInstance];
}
else
{
ns = [NSMessagePortNameServer sharedInstance];
}
host = @"";
service = GDNC_SERVICE;
description = @"local host";

View file

@ -83,12 +83,6 @@ Class NSPort_concrete_class;
{
NSPort_concrete_class = [NSSocketPort class];
}
#if defined(__MINGW32__)
if ([defs boolForKey: @"GSMailslot"] == NO)
{
NSPort_concrete_class = [NSSocketPort class];
}
#endif
}
}

View file

@ -88,16 +88,6 @@
{
o = [NSMessagePortNameServer sharedInstance];
}
#if defined(__MINGW__)
if ([defs boolForKey: @"GSMailslot"] == YES)
{
o = [NSMessagePortNameServer sharedInstance];
}
else
{
o = [NSSocketPortNameServer sharedInstance];
}
#endif
nameServer = RETAIN(o);
}
[gnustep_global_lock unlock];

View file

@ -389,19 +389,7 @@ ihandler(int sig)
}
else
{
#if defined(__MINGW32__)
if ([[NSUserDefaults standardUserDefaults]
boolForKey: @"GSMailslot"] == YES)
{
isLocal = YES;
}
else
{
isPublic = YES;
}
#else
isLocal = YES;
#endif
}
@ -429,10 +417,21 @@ ihandler(int sig)
}
else
{
NSUserDefaults *defs = [NSUserDefaults standardUserDefaults];
if ([defs objectForKey: @"NSPortIsMessagePort"] != nil
&& [defs boolForKey: @"NSPortIsMessagePort"] == NO)
{
ns = [NSSocketPortNameServer sharedInstance];
port = (NSPort*)[NSSocketPort port];
}
else
{
ns = [NSMessagePortNameServer sharedInstance];
port = (NSPort*)[NSMessagePort port];
}
hostname = @"";
service = GDNC_SERVICE;
ns = [NSMessagePortNameServer sharedInstance];
port = (NSPort*)[NSMessagePort port];
}
conn = [[NSConnection alloc] initWithReceivePort: port sendPort: nil];