diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:33 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:33 +0000 |
| commit | 9bbe288d7fd59d4e192a986b8622915ce7b447a9 (patch) | |
| tree | fafb6de8b24840bf282667b820de6e2b4d052c04 /hw/xwin/winconfig.c | |
| parent | 0f8d2fd7d0c6ff169abed9b07ac63b57d80b8811 (diff) | |
70. Merging in the TM branch (Egbert Eich).XORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGE
Diffstat (limited to 'hw/xwin/winconfig.c')
| -rw-r--r-- | hw/xwin/winconfig.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index db69005fd..d62fb18d9 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -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; |