summaryrefslogtreecommitdiff
path: root/plugins/keyboard/msd-keyboard-xkb.c
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-08-18 12:26:39 +0300
committerMonsta <[email protected]>2015-08-18 12:26:39 +0300
commit3ea2c455d7adc3ca33a855d4f73e7a1a3b80f952 (patch)
tree2dc2d6b3317f70f7e052a1dd033f3fbc34c65159 /plugins/keyboard/msd-keyboard-xkb.c
parent56fa568901afb5d0024fbc871f6d1b5d7b7ae3a9 (diff)
downloadmate-settings-daemon-3ea2c455d7adc3ca33a855d4f73e7a1a3b80f952.tar.bz2
mate-settings-daemon-3ea2c455d7adc3ca33a855d4f73e7a1a3b80f952.tar.xz
keyboard: rename variable to better match libmatekbd stuff
Diffstat (limited to 'plugins/keyboard/msd-keyboard-xkb.c')
-rw-r--r--plugins/keyboard/msd-keyboard-xkb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c
index b126fa1..a406fe5 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 */
@@ -143,10 +143,10 @@ apply_desktop_settings (void)
return;
msd_keyboard_manager_apply_settings (manager);
- matekbd_desktop_config_load_from_gsettings (&current_config);
+ matekbd_desktop_config_load_from_gsettings (&current_desktop_config);
/* again, probably it would be nice to compare things
before activating them */
- matekbd_desktop_config_activate (&current_config);
+ matekbd_desktop_config_activate (&current_desktop_config);
show_leds = g_settings_get_boolean (settings_desktop, DUPLICATE_LEDS_KEY);
for (i = sizeof (indicator_icons) / sizeof (indicator_icons[0]);
@@ -581,7 +581,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 (&current_config,
+ matekbd_desktop_config_init (&current_desktop_config,
xkl_engine);
matekbd_keyboard_config_init (&current_kbd_config,
xkl_engine);