ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed X11 display parameter from the config file, this is more 

confusing than useful.
This commit is contained in:
Alexandre Julliard 2003-12-05 00:11:48 +00:00
parent d4baf37085
commit a4330f9363
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/x11drv/x11drv_main.c
View File

@ -237,7 +237,6 @@ static void setup_options(void)
{ {
char buffer[MAX_PATH+16]; char buffer[MAX_PATH+16];
HKEY hkey, appkey = 0; HKEY hkey, appkey = 0;
DWORD count;
if (RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\x11drv", 0, NULL, if (RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\x11drv", 0, NULL,
REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ))
@ -262,19 +261,6 @@ static void setup_options(void)
} }
} }
/* get the display name */
strcpy( buffer, "DISPLAY=" );
count = sizeof(buffer) - 8;
if (!RegQueryValueExA( hkey, "display", 0, NULL, buffer + 8, &count ))
{
const char *display_name = getenv( "DISPLAY" );
if (display_name && strcmp( buffer, display_name ))
MESSAGE( "x11drv: Warning: $DISPLAY variable ignored, using '%s' specified in config file\n",
buffer + 8 );
putenv( strdup(buffer) );
}
if (!get_config_key( hkey, appkey, "Desktop", buffer, sizeof(buffer) )) if (!get_config_key( hkey, appkey, "Desktop", buffer, sizeof(buffer) ))
{ {
/* Imperfect validation: If Desktop=N, then we don't turn on /* Imperfect validation: If Desktop=N, then we don't turn on

2
documentation/samples/config
View File

@ -116,8 +116,6 @@ WINE REGISTRY Version 2
"PerfectGraphics" = "N" "PerfectGraphics" = "N"
; Color depth to use on multi-depth screens ; Color depth to use on multi-depth screens
;;"ScreenDepth" = "16" ;;"ScreenDepth" = "16"
; Name of X11 display to use
;;"Display" = ":0.0"
; Allow the window manager to manage created windows ; Allow the window manager to manage created windows
"Managed" = "Y" "Managed" = "Y"
; Use a desktop window of 640x480 for Wine ; Use a desktop window of 640x480 for Wine