[gnome-settings-daemon/gnome-3-6] main: fix build

[Bastien Nocera <hadess src gnome org>]

commit e408f3af01aea1197382705183c3acf1b5b0ddaf
Author: William Jon McCann <jmccann redhat com>
Date:   Fri Feb 15 13:49:01 2013 -0500

    main: fix build
    
    Conflicts:
        gnome-settings-daemon/main.c

 gnome-settings-daemon/main.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 371933d..e427d86 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -50,6 +50,11 @@ static int        term_signal_pipe_fds[2];
 static guint      name_id      = 0;
 static GnomeSettingsManager *manager = NULL;
 
+#ifdef HAVE_IBUS
+static gboolean is_program_in_path (const char *binary);
+static gboolean keyboard_plugin_is_enabled (void);
+#endif /* HAVE_IBUS */
+
 static GOptionEntry entries[] = {
         {"debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
         { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), 
NULL },
@@ -241,12 +246,14 @@ set_locale_env (void)
         g_free (region);
         g_object_unref (locale_settings);
 
+#ifdef HAVE_IBUS
         /* Set IBus legacy environment */
         if (is_program_in_path ("ibus-daemon") &&
             keyboard_plugin_is_enabled ()) {
-                g_setenv ("QT_IM_MODULE", "ibus");
-                g_setenv ("XMODIFIERS", "@im=ibus");
+                g_setenv ("QT_IM_MODULE", "ibus", TRUE);
+                g_setenv ("XMODIFIERS", "@im=ibus", TRUE);
         }
+#endif
 }
 
 static void