summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2010-01-11 11:14:24 +0000
committerSergey V. Udaltsov <svu@gnome.org>2010-01-11 11:14:24 +0000
commitd7ff7775e4b1fcfd5d86a88abf49467b97b5ed4b (patch)
treebf79f64d12751f4ac47154817ea6b481f34021ba
parentf337dd2e29cdc2913663e32809977c8730f958dc (diff)
downloadlibgnomekbd-d7ff7775e4b1fcfd5d86a88abf49467b97b5ed4b.tar.gz
Extra parameter in xkl_engine_stop_listen
New libxklavier requires stop_listen function to specify exactly the flags for stopping
-rw-r--r--configure.in2
-rw-r--r--libgnomekbd/gkbd-indicator.c3
-rw-r--r--libgnomekbd/gkbd-status.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index af98caf..5540181 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ DBUS_GLIB_REQUIRED=0.34
GCONF_REQUIRED=2.14.0
GDK_REQUIRED=2.13
GTK_REQUIRED=2.13
-LIBXKLAVIER_REQUIRED=4.0
+LIBXKLAVIER_REQUIRED=5.0
AC_SUBST([DBUS_REQUIRED])
AC_SUBST([DBUS_GLIB_REQUIRED])
diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
index 2ddd1f9..0c037a7 100644
--- a/libgnomekbd/gkbd-indicator.c
+++ b/libgnomekbd/gkbd-indicator.c
@@ -658,7 +658,8 @@ gkbd_indicator_start_listen (void)
static void
gkbd_indicator_stop_listen (void)
{
- xkl_engine_stop_listen (globals.engine);
+ xkl_engine_stop_listen (globals.engine,
+ XKLL_TRACK_KEYBOARD_STATE);
gdk_window_remove_filter (NULL, (GdkFilterFunc)
gkbd_indicator_filter_x_evt, NULL);
diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
index 79b6299..571b603 100644
--- a/libgnomekbd/gkbd-status.c
+++ b/libgnomekbd/gkbd-status.c
@@ -515,7 +515,8 @@ gkbd_status_start_listen (void)
static void
gkbd_status_stop_listen (void)
{
- xkl_engine_stop_listen (globals.engine);
+ xkl_engine_stop_listen (globals.engine,
+ XKLL_TRACK_KEYBOARD_STATE);
gdk_window_remove_filter (NULL, (GdkFilterFunc)
gkbd_status_filter_x_evt, NULL);