[gnome-settings-daemon] keyboard: Fix gtk+ IM module getting set to ibus for xkb sources

[Rui Matos <rtcm src gnome org>]

commit 4433ec861a2efdb71f3221c51afe73fe4445c4dc
Author: Rui Matos <tiagomatos gmail com>
Date:   Fri Sep 14 18:44:35 2012 +0200

    keyboard: Fix gtk+ IM module getting set to ibus for xkb sources
    
    Instead of waiting until the async ibus engine set call to finish to
    set the gtk+ IM module to 'ibus' we can just set the module
    unconditionally. The user visible effect is the same, i.e. the user
    will have to change to another input source because the current one
    isn't working right and it simplifies the code.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=684037

 plugins/keyboard/gsd-keyboard-manager.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index 4fff58c..eaf375b 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -375,10 +375,7 @@ set_ibus_engine_finish (GObject            *object,
         if (!result) {
                 g_warning ("Couldn't set IBus engine: %s", error->message);
                 g_error_free (error);
-                return;
         }
-
-        set_gtk_im_module (manager, GTK_IM_MODULE_IBUS);
 }
 
 static void
@@ -863,6 +860,7 @@ apply_input_sources_settings (GSettings          *settings,
                         goto exit;
                 }
 
+                set_gtk_im_module (manager, GTK_IM_MODULE_IBUS);
                 set_ibus_engine (manager, id);
 #else
                 g_warning ("IBus input source type specified but IBus support was not compiled");