diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-02-15 17:33:45 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-02-15 17:33:45 +0100 |
| commit | d69767eedc9f769160f7a06f1afa33e20358699e (patch) | |
| tree | 1a9375fecd812fbac93534da6b45d1f33f678297 /gnome-settings-daemon | |
| parent | 4a164e0aa37917e52ac5526ca0d647bd5f7a393b (diff) | |
| download | gnome-settings-daemon-d69767eedc9f769160f7a06f1afa33e20358699e.tar.gz | |
main: Set our own IBus envvars as well
Just as we set gnome-session's.
https://bugzilla.gnome.org/show_bug.cgi?id=693381
Diffstat (limited to 'gnome-settings-daemon')
| -rw-r--r-- | gnome-settings-daemon/main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c index 673f9ed9..14bb4377 100644 --- a/gnome-settings-daemon/main.c +++ b/gnome-settings-daemon/main.c @@ -242,7 +242,8 @@ set_locale (GDBusProxy *proxy) g_object_unref (locale_settings); } -/* Keep synchronised with set_locale() above */ +/* Keep synchronised with set_locale() and + * set_legacy_ibus_env_vars() above */ static void set_locale_env (void) { @@ -261,6 +262,13 @@ set_locale_env (void) } g_free (region); g_object_unref (locale_settings); + + /* 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"); + } } static void |