[gnome-control-center] region: obtain keyboard variant from IBus



commit 047ae3c9379e8e9b5d3835230a0f211cbebcd1d7
Author: Jinkyu Yi <jincreator jincreator net>
Date:   Wed Aug 20 02:14:09 2014 +0900

    region: obtain keyboard variant from IBus
    
    This will fix unable to show keyboard variant from IBus through menu.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735065

 panels/region/cc-region-panel.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 458fd9a..b045c34 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -1339,7 +1339,7 @@ show_selected_layout (CcRegionPanel *self)
 
                 if (engine_desc) {
                         layout = ibus_engine_desc_get_layout (engine_desc);
-                        variant = "";
+                        variant = ibus_engine_desc_get_layout_variant (engine_desc);
                 } else {
                         g_warning ("Couldn't find IBus input source '%s'", id);
                         return;
@@ -1350,7 +1350,7 @@ show_selected_layout (CcRegionPanel *self)
                 return;
         }
 
-        if (variant[0])
+        if (variant && variant[0])
                 commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
                                                layout, variant);
         else


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