summaryrefslogtreecommitdiff
path: root/libcaribou
diff options
context:
space:
mode:
authorEitan Isaacson <eitan@monotonous.org>2011-07-20 12:35:58 -0700
committerEitan Isaacson <eitan@monotonous.org>2011-07-20 12:35:58 -0700
commit5476dc658b54cd6c013fa15ac88c046156f92cf9 (patch)
tree56a2fe11a46bd89cbe19a058e2f489949330564f /libcaribou
parent37db5ca3610fa776bff577b8df947c0401f8766f (diff)
downloadcaribou-5476dc658b54cd6c013fa15ac88c046156f92cf9.tar.gz
Don't throw an error when no supported layout is found.
Thanks Nohemi!
Diffstat (limited to 'libcaribou')
-rw-r--r--libcaribou/xml-deserializer.vala11
1 files changed, 8 insertions, 3 deletions
diff --git a/libcaribou/xml-deserializer.vala b/libcaribou/xml-deserializer.vala
index d56e22b..853e255 100644
--- a/libcaribou/xml-deserializer.vala
+++ b/libcaribou/xml-deserializer.vala
@@ -43,8 +43,13 @@ namespace Caribou {
return fn;
}
- throw new IOError.NOT_FOUND (
- "Could not find layout file for %s %s", group, variant); }
+ // If no layout file is found, default to US
+ foreach (string data_dir in dirs) {
+ string fn = get_layout_file_inner (data_dir, "us", "");
+ if (fn != null)
+ return fn;
+ }
+ }
public static GroupModel? load_group (string keyboard_type,
string group, string variant) {
@@ -154,4 +159,4 @@ namespace Caribou {
return key;
}
}
-} \ No newline at end of file
+}