diff options
| -rw-r--r-- | plugins/keyboard/msd-keyboard-manager.c | 9 | ||||
| -rw-r--r-- | plugins/media-keys/msd-media-keys-manager.c | 1 | ||||
| -rw-r--r-- | plugins/xrandr/msd-xrandr-manager.c | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c index 61ef2bd..8beadea 100644 --- a/plugins/keyboard/msd-keyboard-manager.c +++ b/plugins/keyboard/msd-keyboard-manager.c @@ -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"); diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c index 14cb02d..09eaefb 100644 --- a/plugins/media-keys/msd-media-keys-manager.c +++ b/plugins/media-keys/msd-media-keys-manager.c @@ -600,7 +600,6 @@ do_eject_action (MsdMediaKeysManager *manager) continue; if (score < SCORE_HAS_MEDIA) { fav_drive = drive; - score = SCORE_HAS_MEDIA; break; } } diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index 7e0a8d9..96e9455 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -785,7 +785,7 @@ find_best_mode (MateRROutput *output) MateRRMode *preferred; MateRRMode **modes; int best_size; - int best_width, best_height, best_rate; + int best_rate; int i; MateRRMode *best_mode; @@ -797,7 +797,7 @@ find_best_mode (MateRROutput *output) if (!modes) return NULL; - best_size = best_width = best_height = best_rate = 0; + best_size = best_rate = 0; best_mode = NULL; for (i = 0; modes[i] != NULL; i++) { @@ -812,8 +812,6 @@ find_best_mode (MateRROutput *output) if (size > best_size) { best_size = size; - best_width = w; - best_height = h; best_rate = r; best_mode = modes[i]; } else if (size == best_size) { |