Merge lp:~wchwch/switchboard-plug-keyboard/fix-1479618 into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

[Alleen Wang]

Fixed Bug#1479618 : switchboard crashes on keyboard

Root caused : When switchboard-plug-keyboard can't to find the keyboard layout via "layouts.txt", it will be crash.
Solution : Add check function for getting the layout and modify loop boundaries on "handler.get_name". If it can't find the keyboard layout on now setting, it will to use name of the keyboard layout and return.

[Danielle Foré (danrabbit)]

We now get the layouts list from xbd-data

Unmerged revisions

373. By Alleen Wang on 2015-11-24

Fixed Bug#1479618

Root caused : When switchboard-plug-keyboard can't to find the keyboard layout via "layouts.txt", it will be crash.
Solution : Add check function for getting the layout and modify loop boundaries on "handler.get_name". If it can't find the keyboard layout on now setting, it will to use name of the keyboard layout and return.

=== modified file 'src/Pages/Layout/display.vala'
--- src/Pages/Layout/display.vala	2015-10-27 00:02:07 +0000
+++ src/Pages/Layout/display.vala	2015-11-24 03:46:00 +0000
@@ -167,8 +167,11 @@
 
             for (uint i = 0; i < settings.layouts.length; i++) {
                 string item = settings.layouts.get_layout (i).name;
-                handler.from_code (item, out layout, out variant);
-                item = handler.get_name (layout, variant);
+
+                if (handler.from_code (item, out layout, out variant))
+                {
+                    item = handler.get_name (layout, variant);
+                }
 
                 list_store.append (out iter);
                 list_store.set (iter, 0, item);

=== modified file 'src/Pages/Layout/handler.vala'
--- src/Pages/Layout/handler.vala	2014-08-10 19:29:15 +0000
+++ src/Pages/Layout/handler.vala	2015-11-24 03:46:00 +0000
@@ -53,7 +53,7 @@
 			if (parts[0] == null) return false;
 
 			while (codes[l] != parts[0])
-				if (l++ > codes.length)
+				if (l++ >= codes.length)
 					return false;
 
 			if (parts[1] == null) return true;