diff options
| author | raveit65 <[email protected]> | 2019-07-10 13:02:06 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-07-11 19:16:47 +0200 |
| commit | 22b646166eadfa939bb17f770811a34670145b4f (patch) | |
| tree | 326dfba27bd5d1a37d73d5fb073807ec531fe512 /plugins/keyboard | |
| parent | 147dc7e03fac861dc95b887f20041d22670e6b75 (diff) | |
| download | mate-settings-daemon-22b646166eadfa939bb17f770811a34670145b4f.tar.bz2 mate-settings-daemon-22b646166eadfa939bb17f770811a34670145b4f.tar.xz | |
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
Diffstat (limited to 'plugins/keyboard')
| -rw-r--r-- | plugins/keyboard/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/keyboard/msd-keyboard-manager.c | 33 |
2 files changed, 0 insertions, 34 deletions
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am index 1d2c93e..bffab68 100644 --- a/plugins/keyboard/Makefile.am +++ b/plugins/keyboard/Makefile.am @@ -41,7 +41,6 @@ libkeyboard_la_LDFLAGS = \ libkeyboard_la_LIBADD = \ $(SETTINGS_PLUGIN_LIBS) \ - $(XF86MISC_LIBS) \ $(LIBMATEKBDUI_LIBS) \ $(NULL) 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 <gdk/gdk.h> #include <gdk/gdkx.h> -#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H -#include <X11/extensions/xf86misc.h> -#endif - #ifdef HAVE_X11_EXTENSIONS_XKB_H #include <X11/XKBlib.h> #include <X11/keysym.h> @@ -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) { @@ -269,10 +240,6 @@ apply_settings (GSettings *settings, #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" "no way to support keyboard autorepeat rate settings"); |