From da56ebbeee95d8c5204b604c4b445d552f1bc3ec Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 10 Jul 2019 13:02:06 +0200 Subject: plugins: drop libXxf86 dependency The X server hasn't implemented it in over 10 years. and it was dropped from debian since a long time. fixes https://github.com/mate-desktop/mate-settings-daemon/issues/284 --- plugins/keyboard/msd-keyboard-manager.c | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'plugins/keyboard/msd-keyboard-manager.c') diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c index 4444c2f..92450a8 100644 --- a/plugins/keyboard/msd-keyboard-manager.c +++ b/plugins/keyboard/msd-keyboard-manager.c @@ -36,10 +36,6 @@ #include #include -#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H -#include -#endif - #ifdef HAVE_X11_EXTENSIONS_XKB_H #include #include @@ -83,31 +79,6 @@ G_DEFINE_TYPE (MsdKeyboardManager, msd_keyboard_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; -#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H -static gboolean xfree86_set_keyboard_autorepeat_rate(int delay, int rate) -{ - gboolean res = FALSE; - int event_base_return; - int error_base_return; - - if (XF86MiscQueryExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), - &event_base_return, - &error_base_return) == True) { - /* load the current settings */ - XF86MiscKbdSettings kbdsettings; - XF86MiscGetKbdSettings (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), &kbdsettings); - - /* assign the new values */ - kbdsettings.delay = delay; - kbdsettings.rate = rate; - XF86MiscSetKbdSettings (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), &kbdsettings); - res = TRUE; - } - - return res; -} -#endif /* HAVE_X11_EXTENSIONS_XF86MISC_H */ - #ifdef HAVE_X11_EXTENSIONS_XKB_H static gboolean xkb_set_keyboard_autorepeat_rate(int delay, int rate) { @@ -268,10 +239,6 @@ apply_settings (GSettings *settings, /* Use XKB in preference */ #ifdef HAVE_X11_EXTENSIONS_XKB_H rate_set = xkb_set_keyboard_autorepeat_rate (delay, rate); -#endif -#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H - if (!rate_set) - rate_set = xfree86_set_keyboard_autorepeat_rate (delay, rate); #endif if (!rate_set) g_warning ("Neither XKeyboard not Xfree86's keyboard extensions are available,\n" -- cgit v1.2.1