[gdm] Take the current XKB config instead of backup



commit 99f776808ce5b9baa048d4e97d197eadbb472a74
Author: Alexey Rusakov <ktirf users sf net>
Date:   Mon Dec 21 15:36:12 2009 -0500

    Take the current XKB config instead of backup
    
    Creating a backup at GDM, means that one won't
    get created when logging in.  This breaks the
    "Reset to defaults" button in the keyboard layouts
    capplet.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=588900

 gui/simple-greeter/gdm-layouts.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c
index 590b03e..5f9aea2 100644
--- a/gui/simple-greeter/gdm-layouts.c
+++ b/gui/simple-greeter/gdm-layouts.c
@@ -50,12 +50,11 @@ init_xkl (void)
 {
         if (config_registry == NULL) {
                 engine = xkl_engine_get_instance (GDK_DISPLAY ());
-                xkl_engine_backup_names_prop (engine);
                 config_registry = xkl_config_registry_get_instance (engine);
                 xkl_config_registry_load (config_registry, FALSE);
 
                 initial_config = xkl_config_rec_new ();
-                if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
+                if (!xkl_config_rec_get_from_server (initial_config, engine)) {
                         g_warning ("failed to load XKB configuration");
                         initial_config->model = g_strdup ("pc105");
                 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]