[gnome-settings-daemon] Fix keyboard indicator displaying

[Sergey V. Udaltsov <svu src gnome org>]

commit 39709d0cfea3e71d326f097cbe7a82cc7699c60d
Author: Martin Pitt <martin pitt ubuntu com>
Date:   Tue Mar 23 15:27:48 2010 +0100

    Fix keyboard indicator displaying
    
    Always call show_hide_icon() in apply_xkb_settings(), not just when we set a
    different keyboard layout. We always want to show the indicator if we have
    multiple keyboard layouts available.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=613666

 plugins/keyboard/gsd-keyboard-xkb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index 748ddd2..62101ab 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -472,7 +472,6 @@ try_activating_xkb_config_if_new (GkbdKeyboardConfig *
 	if (!gkbd_keyboard_config_equals
 	    (&current_kbd_config, current_sys_kbd_config)) {
 		if (gkbd_keyboard_config_activate (&current_kbd_config)) {
-			show_hide_icon ();
 			if (pa_callback != NULL) {
 				(*pa_callback) (pa_callback_user_data);
 				return TRUE;
@@ -686,6 +685,7 @@ apply_xkb_settings (void)
 		xkl_engine_lock_group (current_config.engine,
 				       group_to_activate);
 	gkbd_keyboard_config_term (&current_sys_kbd_config);
+	show_hide_icon ();
 }
 
 static void