diff options
Diffstat (limited to 'hw/xwin/winconfig.c')
| -rw-r--r-- | hw/xwin/winconfig.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index b42b1d6bf..d62fb18d9 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.4 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #include "win.h" #include "winconfig.h" @@ -126,6 +126,11 @@ winReadConfigfile () /* Parse config file into data structure */ filename = xf86openConfigFile (CONFIGPATH, xf86ConfigFile, PROJECTROOT); + + /* Hack for backward compatibility */ + if (!filename && from == X_DEFAULT) + filename = xf86openConfigFile (CONFIGPATH, "XF86Config", PROJECTROOT); + if (filename) { winMsg (from, "Using config file: \"%s\"\n", filename); @@ -258,7 +263,7 @@ winConfigKeyboard (DeviceIntPtr pDevice) g_winInfo.xkb.variant = NULL; g_winInfo.xkb.options = NULL; # else - g_winInfo.xkb.rules = "xfree86"; + g_winInfo.xkb.rules = "xorg"; g_winInfo.xkb.model = "pc101"; g_winInfo.xkb.layout = "us"; g_winInfo.xkb.variant = NULL; |