Commit 7060744a authored by Gunnar Hjalmarsson's avatar Gunnar Hjalmarsson Committed by Ray Strode

main: Don't override IM variables

To give a user the option to use some other input method framework but
IBus, gnome-session should not override the QT_IM_MODULE and XMODIFIERS
environment variables if they are already set. The desired approach has
been implemented in gnome-settings-daemon:

https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=21a16d25d981f3ce34b764dbc8005dbf8edfbe97

It would be consistent to change gnome-session in a similar way.
parent 4abdb792
......@@ -399,8 +399,15 @@ main (int argc, char **argv)
ibus_path = g_find_program_in_path("ibus-daemon");
if (ibus_path) {
gsm_util_setenv ("QT_IM_MODULE", "ibus");
gsm_util_setenv ("XMODIFIERS", "@im=ibus");
const gchar *p;
p = g_getenv ("QT_IM_MODULE");
if (!p || !*p)
p = "ibus";
gsm_util_setenv ("QT_IM_MODULE", p);
p = g_getenv ("XMODIFIERS");
if (!p || !*p)
p = "@im=ibus";
gsm_util_setenv ("XMODIFIERS", p);
}
g_free (ibus_path);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment