From 3528aa7435f25aad1490805ab4899e728efd7947 Mon Sep 17 00:00:00 2001 From: Monsta Date: Tue, 18 Aug 2015 12:26:39 +0300 Subject: keyboard: rename variable to better match libmatekbd stuff --- plugins/keyboard/msd-keyboard-xkb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c index 2e6e0ec..6b2dea3 100644 --- a/plugins/keyboard/msd-keyboard-xkb.c +++ b/plugins/keyboard/msd-keyboard-xkb.c @@ -58,7 +58,7 @@ static GSettings* settings_kbd; static XklEngine* xkl_engine; static XklConfigRegistry* xkl_registry = NULL; -static MatekbdDesktopConfig current_config; +static MatekbdDesktopConfig current_desktop_config; static MatekbdKeyboardConfig current_kbd_config; /* never terminated */ @@ -155,10 +155,10 @@ apply_desktop_settings (void) return; msd_keyboard_manager_apply_settings (manager); - matekbd_desktop_config_load_from_gsettings (¤t_config); + matekbd_desktop_config_load_from_gsettings (¤t_desktop_config); /* again, probably it would be nice to compare things before activating them */ - matekbd_desktop_config_activate (¤t_config); + matekbd_desktop_config_activate (¤t_desktop_config); show_leds = g_settings_get_boolean (settings_desktop, DUPLICATE_LEDS_KEY); for (i = sizeof (indicator_icons) / sizeof (indicator_icons[0]); @@ -593,7 +593,7 @@ msd_keyboard_xkb_init (MsdKeyboardManager * kbd_manager) settings_desktop = g_settings_new (MATEKBD_DESKTOP_SCHEMA); settings_kbd = g_settings_new (MATEKBD_KBD_SCHEMA); - matekbd_desktop_config_init (¤t_config, + matekbd_desktop_config_init (¤t_desktop_config, xkl_engine); matekbd_keyboard_config_init (¤t_kbd_config, xkl_engine); -- cgit v1.2.1