[gnome-settings-daemon] keyboard: Rename apply_xkb_layout() to make its purpose clearer



commit 1a5db5e14b5d48f2e62400976d3ad78521edf17b
Author: Rui Matos <tiagomatos gmail com>
Date:   Thu Sep 13 01:02:49 2012 +0200

    keyboard: Rename apply_xkb_layout() to make its purpose clearer
    
    This renames apply_xkb_layout() to apply_xkb_settings() to make it
    clear that we also apply the options there. The options can't be
    skipped if the setting is empty because then there would be no way for
    users to get rid of them when disabling all of them in g-c-c.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683878

 plugins/keyboard/gsd-keyboard-manager.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index 6162bc5..4fff58c 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -745,9 +745,9 @@ add_xkb_options (GsdKeyboardManager *manager,
 }
 
 static void
-apply_xkb_layout (GsdKeyboardManager *manager,
-                  const gchar        *layout,
-                  const gchar        *variant)
+apply_xkb_settings (GsdKeyboardManager *manager,
+                    const gchar        *layout,
+                    const gchar        *variant)
 {
         XkbRF_RulesRec *xkb_rules;
         XkbRF_VarDefsRec *xkb_var_defs;
@@ -872,7 +872,7 @@ apply_input_sources_settings (GSettings          *settings,
         }
 
  exit:
-        apply_xkb_layout (manager, layout, variant);
+        apply_xkb_settings (manager, layout, variant);
         g_variant_unref (sources);
         /* Prevent individual "changed" signal invocations since we
            don't need them. */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]