diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2008-10-28 01:50:55 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2008-10-28 01:50:55 +0000 |
| commit | 87f44642772d8827386b60e9fa8ea89c049ecb3a (patch) | |
| tree | e5f8904c09ca264b0d03623d683e940f38e3b320 /libxklavier/xklavier_config_xkb.c | |
| parent | d1a0ecf165270e901d0889f2d65d902c4c828b5a (diff) | |
| download | libxklavier-87f44642772d8827386b60e9fa8ea89c049ecb3a.tar.gz | |
introducing device_id
Diffstat (limited to 'libxklavier/xklavier_config_xkb.c')
| -rw-r--r-- | libxklavier/xklavier_config_xkb.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c index c5f18a3..dac6a9a 100644 --- a/libxklavier/xklavier_config_xkb.c +++ b/libxklavier/xklavier_config_xkb.c @@ -182,15 +182,7 @@ xkl_config_get_keyboard(XklEngine * engine, gboolean activate) { XkbDescPtr xkb = NULL; -#if 0 - xkb = XkbGetKeyboardByName(_xklDpy, - XkbUseCoreKbd, - &componentNames, - XkbGBN_AllComponentsMask & - (~XkbGBN_GeometryMask), - XkbGBN_AllComponentsMask & - (~XkbGBN_GeometryMask), activate); -#else + char xkm_fn[L_tmpnam]; char xkb_fn[L_tmpnam]; FILE *tmpxkm; @@ -309,8 +301,7 @@ xkl_config_get_keyboard(XklEngine * engine, } } else /* no activate, just load */ xkb = - result. - xkb; + result.xkb; } else { /* could not load properly */ xkl_debug(0, @@ -380,7 +371,6 @@ xkl_config_get_keyboard(XklEngine * engine, xkl_debug(0, "Could not get tmp names\n"); } -#endif return xkb; } #else /* no XKB headers */ |