diff options
| author | Monsta <[email protected]> | 2015-08-18 12:26:39 +0300 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-08-31 15:48:26 +0200 |
| commit | 3528aa7435f25aad1490805ab4899e728efd7947 (patch) | |
| tree | 1898d9bdb68d5ef2536cdff56aa180c75b753639 | |
| parent | 2547c1ac0a6ea7b32862f14984a79d15ede0947b (diff) | |
| download | mate-settings-daemon-3528aa7435f25aad1490805ab4899e728efd7947.tar.bz2 mate-settings-daemon-3528aa7435f25aad1490805ab4899e728efd7947.tar.xz | |
keyboard: rename variable to better match libmatekbd stuff
| -rw-r--r-- | plugins/keyboard/msd-keyboard-xkb.c | 8 |
1 files 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); |