gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 11:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't set NSHost from X display name.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@22445 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2006-02-06 20:31:39 +00:00
parent d9a4b4da8d
commit 23e714f886
2 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-02-06 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServer.m (_initXContext): Don't set the environment
value for NSHOST. Patch by Tim MacIntosh <tmcintos@avalon.net>.
See mails on dev mailing list for more explaination.
2006-02-06 Fred Kiefer <FredKiefer@gmx.de>
* Headers/x11/xdnd.h: Declare two more functions used in xpbs.m.

36
Source/x11/XGServer.m
View file

@ -361,15 +361,16 @@ _parse_display_name(NSString *name, int *dn, int *sn)
- _initXContext
{
int screen_number, display_number;
NSString *display_name, *host;
NSString *display_name;
XGScreenContext *screen;
host = [[NSUserDefaults standardUserDefaults] stringForKey: @"NSHost"];
display_name = [server_info objectForKey: GSDisplayName];
if (display_name == nil)
{
NSString *host = [[NSUserDefaults standardUserDefaults] stringForKey: @"NSHost"];
NSString *dn = [server_info objectForKey: GSDisplayNumber];
NSString *sn = [server_info objectForKey: GSScreenNumber];
if (dn || sn)
{
if (dn == NULL)
@ -380,35 +381,8 @@ _parse_display_name(NSString *name, int *dn, int *sn)
host = @"";
display_name = [NSString stringWithFormat: @"%@:%@.%@", host, dn,sn];
}
}
if (display_name == nil)
{
if (host == nil)
{
NSString *d = [[[NSProcessInfo processInfo] environment]
objectForKey: @"DISPLAY"];
host = _parse_display_name(d, &display_number, &screen_number);
if (display_number != 0)
{
NSLog(@"NOTE: Only one display per host fully supported.");
}
if ([host isEqual: @""] == NO)
{
/**
* If we are using the DISPLAY environment variable to
* determine where to display, set the NSHost default
* so that other parts of the system know where we are
* displaying.
*/
[[NSUserDefaults standardUserDefaults] registerDefaults:
[NSDictionary dictionaryWithObject: host
forKey: @"NSHost"]];
}
}
else if ([host isEqual: @""] == NO)
{
else if ((host != nil) && ([host isEqual: @""] == NO))
{
/**
* If the NSHost default told us to display somewhere, we need
* to generate a display name for X from the host name and the