From bbf89d121b7ba4bacf655fc00e3bfd938f956454 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Sat, 8 Jan 2005 23:00:52 +0000 Subject: [PATCH] fixing #163299 --- gnome-settings-daemon/ChangeLog | 4 ++++ gnome-settings-daemon/gnome-settings-keyboard-xkb.c | 13 +++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 079b67211..878d32a46 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,7 @@ +2005-01-08 Sergey V. Udaltsov + + * gnome-settings-keyboard-xkb.c: fix #163299 + 2005-01-07 Sebastien Bacher * gnome-settings-mouse.c: (set_locate_pointer): add Mod2Mask and diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c index 24d468737..0ff732881 100644 --- a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c +++ b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c @@ -288,6 +288,15 @@ gnome_settings_keyboard_xkb_set_post_activation_callback paCallbackUserData = userData; } +static GdkFilterReturn +gnome_settings_keyboard_xkb_evt_filter (GdkXEvent * xev, + GdkEvent * event) +{ + XEvent *xevent = (XEvent *) xev; + XklFilterEvents (xevent); + return GDK_FILTER_CONTINUE; +} + void gnome_settings_keyboard_xkb_init (GConfClient * client) { @@ -312,10 +321,10 @@ gnome_settings_keyboard_xkb_init (GConfClient * client) (KeyCallbackFunc) apply_xkb_settings); gdk_window_add_filter (NULL, - (GdkFilterFunc) XklFilterEvents, + (GdkFilterFunc) gnome_settings_keyboard_xkb_evt_filter, NULL); gdk_window_add_filter (gdk_get_default_root_window(), - (GdkFilterFunc) XklFilterEvents, + (GdkFilterFunc) gnome_settings_keyboard_xkb_evt_filter, NULL); XklStartListen (XKLL_MANAGE_LAYOUTS | XKLL_MANAGE_WINDOW_STATES); }