diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2010-10-22 19:45:18 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2010-10-22 19:45:18 -0700 |
| commit | 8846b589de9c5580fa840e693444cdfd1ee685d5 (patch) | |
| tree | 00030b4d249f895ee04886c2b47cc7b33526e9ab /xrdp | |
| parent | 368db230613a5dbb3de6f07764845110102ae9f6 (diff) | |
| download | xrdp-proprietary-8846b589de9c5580fa840e693444cdfd1ee685d5.tar.gz xrdp-proprietary-8846b589de9c5580fa840e693444cdfd1ee685d5.zip | |
use en-us keymap file if no keymap file
Diffstat (limited to 'xrdp')
| -rw-r--r-- | xrdp/lang.c | 5 | ||||
| -rw-r--r-- | xrdp/xrdp_listen.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/xrdp/lang.c b/xrdp/lang.c index 998c6d94..0623b91e 100644 --- a/xrdp/lang.c +++ b/xrdp/lang.c @@ -209,6 +209,11 @@ get_keymaps(int keylayout, struct xrdp_keymap* keymap) filename = (char*)g_malloc(256, 0); /* check if there is a keymap file */ g_snprintf(filename, 255, "%s/km-%4.4x.ini", XRDP_CFG_PATH, keylayout); + /* if the file does not exist, try again with 'en-us' as fallback */ + if (!g_file_exist(filename)) + { + g_snprintf(filename, 255, "%s/km-0409.ini", XRDP_CFG_PATH); + } if (g_file_exist(filename)) { fd = g_file_open(filename); diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c index c5746281..80aa64d3 100644 --- a/xrdp/xrdp_listen.c +++ b/xrdp/xrdp_listen.c @@ -225,7 +225,7 @@ xrdp_listen_main_loop(struct xrdp_listen* self) self->status = -1; return 1; } - error = trans_listen_address(self->listen_trans, port,address); + error = trans_listen_address(self->listen_trans, port, address); if (error == 0) { self->listen_trans->trans_conn_in = xrdp_listen_conn_in; |