jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use en-us keymap file if no keymap file

Browse Source
This commit is contained in:
Jay Sorg 2010-10-22 19:45:18 -07:00
parent 368db23061
commit 8846b589de
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xrdp/lang.c
View File

@ -209,6 +209,11 @@ get_keymaps(int keylayout, struct xrdp_keymap* keymap)
filename = (char*)g_malloc(256, 0); filename = (char*)g_malloc(256, 0);
/* check if there is a keymap file */ /* check if there is a keymap file */
g_snprintf(filename, 255, "%s/km-%4.4x.ini", XRDP_CFG_PATH, keylayout); 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)) if (g_file_exist(filename))
{ {
fd = g_file_open(filename); fd = g_file_open(filename);

2
xrdp/xrdp_listen.c
View File

@ -225,7 +225,7 @@ xrdp_listen_main_loop(struct xrdp_listen* self)
self->status = -1; self->status = -1;
return 1; return 1;
} }
error = trans_listen_address(self->listen_trans, port,address); error = trans_listen_address(self->listen_trans, port, address);
if (error == 0) if (error == 0)
{ {
self->listen_trans->trans_conn_in = xrdp_listen_conn_in; self->listen_trans->trans_conn_in = xrdp_listen_conn_in;