From aa8b1bbe1becaec01ece9db08d33545707bb18b3 Mon Sep 17 00:00:00 2001 From: monsta Date: Wed, 26 Oct 2016 15:51:15 +0300 Subject: build: require XInput unconditionally as done in g-s-d six years ago: https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=5b2a28376a3aa81d865679e8c91d2f6beb8af799 --- plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'plugins/a11y-keyboard') diff --git a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c index 6d70f4e..88f11dc 100644 --- a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c +++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c @@ -40,11 +40,8 @@ #include #include - -#ifdef HAVE_X11_EXTENSIONS_XINPUT_H #include #include -#endif #ifdef HAVE_LIBNOTIFY #include @@ -94,7 +91,6 @@ static gpointer manager_object = NULL; #define d(str) do { } while (0) #endif -#ifdef HAVE_X11_EXTENSIONS_XINPUT_H static GdkFilterReturn devicepresence_filter (GdkXEvent *xevent, GdkEvent *event, @@ -154,7 +150,6 @@ set_devicepresence_handler (MsdA11yKeyboardManager *manager) if (!gdk_error_trap_pop ()) gdk_window_add_filter (NULL, devicepresence_filter, manager); } -#endif static gboolean xkb_enabled (MsdA11yKeyboardManager *manager) @@ -1014,9 +1009,7 @@ start_a11y_keyboard_idle_cb (MsdA11yKeyboardManager *manager) manager->priv->settings = g_settings_new (CONFIG_SCHEMA); g_signal_connect (manager->priv->settings, "changed", G_CALLBACK (keyboard_callback), manager); -#ifdef HAVE_X11_EXTENSIONS_XINPUT_H - set_devicepresence_handler (manager); -#endif + set_devicepresence_handler (manager); /* Save current xkb state so we can restore it on exit */ @@ -1097,9 +1090,7 @@ msd_a11y_keyboard_manager_stop (MsdA11yKeyboardManager *manager) g_debug ("Stopping a11y_keyboard manager"); -#ifdef HAVE_X11_EXTENSIONS_XINPUT_H gdk_window_remove_filter (NULL, devicepresence_filter, manager); -#endif if (p->status_icon) gtk_status_icon_set_visible (p->status_icon, FALSE); -- cgit v1.2.1