diff options
Diffstat (limited to 'plugins/keyboard/msd-keyboard-manager.c')
| -rw-r--r-- | plugins/keyboard/msd-keyboard-manager.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c index 61ef2bd..06bc322 100644 --- a/plugins/keyboard/msd-keyboard-manager.c +++ b/plugins/keyboard/msd-keyboard-manager.c @@ -2,6 +2,7 @@ * * Copyright © 2001 Ximian, Inc. * Copyright (C) 2007 William Jon McCann <[email protected]> + * Copyright (C) 2012-2021 MATE Developers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -73,7 +74,6 @@ G_DEFINE_TYPE_WITH_PRIVATE (MsdKeyboardManager, msd_keyboard_manager, G_TYPE_OBJ static gpointer manager_object = NULL; - #ifdef HAVE_X11_EXTENSIONS_XKB_H static gboolean xkb_set_keyboard_autorepeat_rate(int delay, int rate) { @@ -201,8 +201,6 @@ apply_settings (GSettings *settings, XKeyboardControl kbdcontrol; gboolean repeat; gboolean click; - int rate; - int delay; int click_volume; int bell_volume; int bell_pitch; @@ -215,8 +213,6 @@ apply_settings (GSettings *settings, repeat = g_settings_get_boolean (settings, KEY_REPEAT); click = g_settings_get_boolean (settings, KEY_CLICK); - rate = g_settings_get_int (settings, KEY_RATE); - delay = g_settings_get_int (settings, KEY_DELAY); click_volume = g_settings_get_int (settings, KEY_CLICK_VOLUME); bell_pitch = g_settings_get_int (settings, KEY_BELL_PITCH); bell_duration = g_settings_get_int (settings, KEY_BELL_DURATION); @@ -233,8 +229,9 @@ apply_settings (GSettings *settings, XAutoRepeatOn (GDK_DISPLAY_XDISPLAY (display)); /* Use XKB in preference */ #ifdef HAVE_X11_EXTENSIONS_XKB_H - rate_set = xkb_set_keyboard_autorepeat_rate (delay, rate); -#endif + rate_set = xkb_set_keyboard_autorepeat_rate (g_settings_get_int (settings, KEY_DELAY), + g_settings_get_int (settings, KEY_RATE)); +#endif /* HAVE_X11_EXTENSIONS_XKB_H */ if (!rate_set) g_warning ("Neither XKeyboard not Xfree86's keyboard extensions are available,\n" "no way to support keyboard autorepeat rate settings"); |