[gnome-initial-setup/shell/4765: 265/362] keyboard: don't call update_input() on construction



commit 408c9fae8017f7725b31547118a14dcedc87b5c3
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Wed Oct 8 14:23:52 2014 -0700

    keyboard: don't call update_input() on construction
    
    In commit fd8770a0e28bd86935c76668edf38adc734d71d0 code was added to
    call update_input() on page construction.
    
    update_input() will do two things:
    - update GSettings according to the current layouts
    - call into localed to set the system layout to the selected one,
      checking a GPermission before
    
    Since localed is created asynchronously, and the GPermission doesn't
    even exist at that point, we end up printing up criticals to the
    terminal, and never actually call into localed.
    
    For what fd8770a0e28bd86935c76668edf38adc734d71d0 was trying to fix, it
    should be sufficient to synchronize the GSettings, so do that instead.
    
    [endlessm/eos-shell#3939]

 .../pages/keyboard/gis-keyboard-page.c             |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c 
b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
index 154c31d..fd87ff8 100644
--- a/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+++ b/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
@@ -1026,6 +1026,7 @@ setup_input_section (GisKeyboardPage *self)
                                   G_CALLBACK (current_input_source_changed), self);
 
         add_default_input_source_for_locale (self);
+        set_input_settings (self);
         current_input_source_changed (self);
 }
 


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