[gnome-settings-daemon] main: Don't set IBus envvars if keyboard plugin is disabled

[Bastien Nocera <hadess src gnome org>]

commit 3c23552d9d73e45319742f80e250375d7a8eac13
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Nov 30 07:38:19 2012 +0100

    main: Don't set IBus envvars if keyboard plugin is disabled
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689070

 gnome-settings-daemon/main.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 6548182..fde463e 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -273,10 +273,23 @@ is_program_in_path (const char *binary)
 	return TRUE;
 }
 
+static gboolean
+keyboard_plugin_is_enabled (void)
+{
+        GSettings *settings;
+
+        settings = g_settings_new ("org.gnome.settings-daemon.plugins.keyboard");
+        enabled = g_settings_get_boolen (settings, "active");
+        g_object_unref (settings);
+
+        return enabled;
+}
+
 static void
 set_legacy_ibus_env_vars (GDBusProxy *proxy)
 {
-        if (is_program_in_path ("ibus-daemon")) {
+        if (is_program_in_path ("ibus-daemon") &&
+            keyboard_plugin_is_enabled ()) {
                 set_session_env (proxy, "QT_IM_MODULE", "ibus");
                 set_session_env (proxy, "XMODIFIERS", "@im=ibus");
         }