[gnome-settings-daemon] keyboard: Remove the special handling of settings under GDM
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] keyboard: Remove the special handling of settings under GDM
- Date: Tue, 17 Mar 2015 17:20:32 +0000 (UTC)
commit 644d36f5e7d11c25fd2ee33c88800e3846efca38
Author: Rui Matos <tiagomatos gmail com>
Date: Mon Mar 16 15:02:56 2015 +0100
keyboard: Remove the special handling of settings under GDM
This has always been a hack and a cause of dconf writes during startup
so let's remove it now that gnome-shell has learned how to get its
system keyboard settings.
https://bugzilla.gnome.org/show_bug.cgi?id=746289
plugins/keyboard/gsd-keyboard-manager.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index df496dc..e7117c2 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -660,17 +660,8 @@ maybe_create_initial_settings (GsdKeyboardManager *manager)
settings = manager->priv->input_sources_settings;
- if (g_getenv ("RUNNING_UNDER_GDM")) {
- GVariantBuilder builder;
- /* clean the settings and get them from the "system" */
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
- g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
- get_sources_from_xkb_config (manager);
-
- g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, NULL);
- get_options_from_xkb_config (manager);
+ if (g_getenv ("RUNNING_UNDER_GDM"))
return;
- }
maybe_convert_old_settings (settings);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]