diff options
| author | Sergey V. Udaltsov <svu@gnome.org> | 2010-01-11 11:20:13 +0000 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2010-01-11 11:20:13 +0000 |
| commit | 70c902628f7d9e757b88445b1bfb3841e88ff2f9 (patch) | |
| tree | b34e8e7929d371c2c1be6e194748912839b3114b | |
| parent | b4f4178515d4c88369671fffe8c87ceecc6d93c5 (diff) | |
| download | gnome-settings-daemon-70c902628f7d9e757b88445b1bfb3841e88ff2f9.tar.gz | |
Extra parameter for xkl_engine_stop_listen
New version of libxklavier (5.0) requires to specify flags when you stop
listening
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/keyboard/gsd-keyboard-xkb.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a85fdb20..c0032a1f 100644 --- a/configure.ac +++ b/configure.ac @@ -220,7 +220,7 @@ AC_CHECK_X_LIB(Xxf86misc, XF86MiscQueryExtension, [ AC_SUBST(XF86MISC_LIBS) AC_CHECK_X_HEADERS([X11/extensions/XKB.h]) -PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 2.29.5 libgnomekbd >= 2.29.5 libxklavier >= 4.0]) +PKG_CHECK_MODULES(LIBGNOMEKBDUI, [libgnomekbdui >= 2.29.5 libgnomekbd >= 2.29.5 libxklavier >= 5.0]) AC_SUBST(LIBGNOMEKBDUI_CFLAGS) AC_SUBST(LIBGNOMEKBDUI_LIBS) diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c index a86fc805..a7fb5b5c 100644 --- a/plugins/keyboard/gsd-keyboard-xkb.c +++ b/plugins/keyboard/gsd-keyboard-xkb.c @@ -539,8 +539,8 @@ filter_xkb_config (void) current_kbd_config.layouts_variants = g_slist_delete_link - (current_kbd_config. - layouts_variants, filtered); + (current_kbd_config.layouts_variants, + filtered); any_change = TRUE; continue; } @@ -892,7 +892,9 @@ gsd_keyboard_xkb_shutdown (void) if (!inited_ok) return; - xkl_engine_stop_listen (xkl_engine); + xkl_engine_stop_listen (xkl_engine, + XKLL_MANAGE_LAYOUTS | + XKLL_MANAGE_WINDOW_STATES); gdk_window_remove_filter (NULL, (GdkFilterFunc) gsd_keyboard_xkb_evt_filter, NULL); |