Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
GNOME
gnome-settings-daemon
Commits
3c23552d
Commit
3c23552d
authored
Nov 30, 2012
by
Bastien Nocera
Browse files
main: Don't set IBus envvars if keyboard plugin is disabled
https://bugzilla.gnome.org/show_bug.cgi?id=689070
parent
a831f98e
Changes
1
Hide whitespace changes
Inline
Side-by-side
gnome-settings-daemon/main.c
View file @
3c23552d
...
...
@@ -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"
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment