diff options
| author | monsta <[email protected]> | 2016-10-26 15:51:15 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-10-26 15:51:15 +0300 |
| commit | aa8b1bbe1becaec01ece9db08d33545707bb18b3 (patch) | |
| tree | 564236210c036bd0bb43e93ebfc1444e6c23c66f /plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | |
| parent | c45edfab1fd9ef8af7d78d531aeaeb1c654cc272 (diff) | |
| download | mate-settings-daemon-aa8b1bbe1becaec01ece9db08d33545707bb18b3.tar.bz2 mate-settings-daemon-aa8b1bbe1becaec01ece9db08d33545707bb18b3.tar.xz | |
build: require XInput unconditionally
as done in g-s-d six years ago:
https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=5b2a28376a3aa81d865679e8c91d2f6beb8af799
Diffstat (limited to 'plugins/a11y-keyboard/msd-a11y-keyboard-manager.c')
| -rw-r--r-- | plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | 11 |
1 files changed, 1 insertions, 10 deletions
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 <X11/XKBlib.h> #include <X11/extensions/XKBstr.h> - -#ifdef HAVE_X11_EXTENSIONS_XINPUT_H #include <X11/extensions/XInput.h> #include <X11/extensions/XIproto.h> -#endif #ifdef HAVE_LIBNOTIFY #include <libnotify/notify.h> @@ -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); |