diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-11-09 12:28:57 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-11-09 15:55:25 +0100 |
| commit | d4dd02e60a5bf8cd9a91ead3394ca012c0c1a75d (patch) | |
| tree | e696a24cc5c0e23f674c82324be9c86774c192f5 /gnome-settings-daemon/main.c | |
| parent | b3b2ed05a9e84d5cfafe63ccc4508f10b0a60529 (diff) | |
| download | gnome-settings-daemon-d4dd02e60a5bf8cd9a91ead3394ca012c0c1a75d.tar.gz | |
main: Always set the IBus envvars
Only if IBus is available though. #fallback
Diffstat (limited to 'gnome-settings-daemon/main.c')
| -rw-r--r-- | gnome-settings-daemon/main.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c index 33d088a9..65481821 100644 --- a/gnome-settings-daemon/main.c +++ b/gnome-settings-daemon/main.c @@ -276,22 +276,9 @@ is_program_in_path (const char *binary) static void set_legacy_ibus_env_vars (GDBusProxy *proxy) { - GVariant *prop; - const gchar *name; - - prop = g_dbus_proxy_get_cached_property (proxy, "session-name"); - if (prop) { - g_variant_get (prop, "&s", &name); - - if (g_strcmp0 (name, "gnome") == 0 && - is_program_in_path ("ibus-daemon")) { - set_session_env (proxy, "QT_IM_MODULE", "ibus"); - set_session_env (proxy, "XMODIFIERS", "@im=ibus"); - } - - g_variant_unref (prop); - } else { - g_print ("failed to get SessionName\n"); + if (is_program_in_path ("ibus-daemon")) { + set_session_env (proxy, "QT_IM_MODULE", "ibus"); + set_session_env (proxy, "XMODIFIERS", "@im=ibus"); } } #endif |