andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop searching for XF86Config files

Browse Source 
xorg.conf has been used since the X11R6.7 release in April 2004.
6 years has been a generous transition period for users to
"mv XF86Config xorg.conf" and for distros to update their
configuration tools and packages.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Alan Coopersmith 2010-06-03 18:59:04 -07:00 committed by Keith Packard
parent 01c75522b6
commit d163266692
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/parser/scan.c
View File

@ -626,7 +626,6 @@ xf86pathIsSafe(const char *path)
#ifndef XCONFENV
#define XCONFENV "XORGCONFIG"
#endif
#define XFREE86CFGFILE "XF86Config"
/* xorg.conf is based on XF86Config version 4. If we ever break
compatibility of the xorg.conf syntax, we'll bump this version number. */
#ifndef CONFIG_FILE_VERSION
@ -988,11 +987,8 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
if (!projroot || !projroot[0])
projroot = PROJECTROOT;
/* Search for a config file or a fallback */
/* Search for a config file */
configPath = OpenConfigFile(path, cmdline, projroot, XCONFIGFILE);
if (!configPath)
configPath = OpenConfigFile(path, cmdline, projroot,
XFREE86CFGFILE);
return configPath;
}