diff options
author | Rui Matos <tiagomatos@gmail.com> | 2014-09-10 18:01:53 +0200 |
---|---|---|
committer | Rui Matos <tiagomatos@gmail.com> | 2014-09-11 19:30:30 +0200 |
commit | 326ee9f9a102a58941473e08fbe6221e70369f7f (patch) | |
tree | 113b249f7fab8a2d9e48c17cfcc5ac28fc90a2d7 /gnome-settings-daemon | |
parent | df64873cdf794673300a315a03f08e24e3297069 (diff) | |
download | gnome-settings-daemon-326ee9f9a102a58941473e08fbe6221e70369f7f.tar.gz |
keyboard: Remove input sources handling
All of this functionality is moving into mutter/gnome-shell so that
both wayland and X sessions follow the same code paths as closely as
possible.
https://bugzilla.gnome.org/show_bug.cgi?id=736436
Diffstat (limited to 'gnome-settings-daemon')
-rw-r--r-- | gnome-settings-daemon/main.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c index 38b355e6..4d1140b6 100644 --- a/gnome-settings-daemon/main.c +++ b/gnome-settings-daemon/main.c @@ -240,7 +240,6 @@ set_locale (GDBusProxy *proxy) g_object_unref (locale_settings); } -#ifdef HAVE_IBUS static gboolean is_program_in_path (const char *binary) { @@ -253,29 +252,14 @@ is_program_in_path (const char *binary) return TRUE; } -static gboolean -keyboard_plugin_is_enabled (void) -{ - GSettings *settings; - gboolean enabled; - - settings = g_settings_new ("org.gnome.settings-daemon.plugins.keyboard"); - enabled = g_settings_get_boolean (settings, "active"); - g_object_unref (settings); - - return enabled; -} - static void set_legacy_ibus_env_vars (GDBusProxy *proxy) { - if (is_program_in_path ("ibus-daemon") && - keyboard_plugin_is_enabled ()) { + if (is_program_in_path ("ibus-daemon")) { set_session_env (proxy, "QT_IM_MODULE", "ibus"); set_session_env (proxy, "XMODIFIERS", "@im=ibus"); } } -#endif static void register_with_gnome_session (GDBusProxy *proxy) @@ -315,9 +299,8 @@ name_acquired_handler (GDBusConnection *connection, /* Always call this first, as Setenv can only be called before any client registers */ set_locale (proxy); -#ifdef HAVE_IBUS set_legacy_ibus_env_vars (proxy); -#endif + start_settings_manager (); register_with_gnome_session (proxy); g_unix_signal_add (SIGTERM, on_term_signal, manager); |