xserver: Branch 'master'
Tiago Vignatti
vignatti at kemper.freedesktop.org
Wed Jun 11 14:22:49 PDT 2008
hw/xfree86/common/xf86Config.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 390b155135a451fa728b73c8107aea91dfd56ed1
Author: Tiago Vignatti <vignatti at c3sl.ufpr.br>
Date: Wed Jun 11 18:21:33 2008 -0300
Welcome to hotplug era.
`rm -rf xorg.conf` does not imply an error message. Maybe a warning.
checkInput() is defined but not used.
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 601b9bb..eb084a5 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2454,12 +2454,6 @@ addDefaultModes(MonPtr monitorp)
return TRUE;
}
-static void
-checkInput(serverLayoutPtr layout) {
- if (!xf86Info.allowEmptyInput)
- checkCoreInputDevices(layout, FALSE);
-}
-
/*
* load the config file and fill the global data structure
*/
@@ -2486,7 +2480,7 @@ xf86HandleConfigFile(Bool autoconfig)
xf86MsgVerb(from, 0, "Using config file: \"%s\"\n", filename);
xf86ConfigFile = xnfstrdup(filename);
} else {
- xf86Msg(X_ERROR, "Unable to locate/open config file");
+ xf86Msg(X_WARNING, "Unable to locate/open config file");
if (xf86ConfigFile)
xf86ErrorFVerb(0, ": \"%s\"", xf86ConfigFile);
xf86ErrorFVerb(0, "\n");
More information about the xorg-commit
mailing list