--- sourceforge.net/trunk/rdesktop/xkeymap.c 2005/08/03 08:25:32 957 +++ sourceforge.net/trunk/rdesktop/xkeymap.c 2005/08/03 08:41:02 960 @@ -184,13 +184,6 @@ char *home; FILE *fp; - /* Try KEYMAP_PATH */ - path1 = pathjoin(KEYMAP_PATH, filename); - fp = fopen(path1, "r"); - xfree(path1); - if (fp) - return fp; - /* Try ~/.rdesktop/keymaps */ home = getenv("HOME"); if (home) @@ -204,6 +197,13 @@ return fp; } + /* Try KEYMAP_PATH */ + path1 = pathjoin(KEYMAP_PATH, filename); + fp = fopen(path1, "r"); + xfree(path1); + if (fp) + return fp; + /* Try current directory, in case we are running from the source tree */ path1 = pathjoin("keymaps", filename);