From 387066c2e5bda159201896b194711965b52f34a9 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Fri, 30 May 2014 18:20:16 +0200 Subject: [PATCH] localed: consider an unset model as a wildcard --- src/locale/localed.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git src/locale/localed.c src/locale/localed.c index e3061c8..358f6c2 100644 --- src/locale/localed.c +++ src/locale/localed.c @@ -712,15 +712,16 @@ static int find_legacy_keymap(Context *c, char **new_keymap) { } } - if (matching > 0 && - streq_ptr(c->x11_model, a[2])) { - matching++; - - if (streq_ptr(c->x11_variant, a[3])) { + if (matching > 0) { + if (isempty(c->x11_model) || streq_ptr(c->x11_model, a[2])) { matching++; - if (streq_ptr(c->x11_options, a[4])) + if (streq_ptr(c->x11_variant, a[3])) { matching++; + + if (streq_ptr(c->x11_options, a[4])) + matching++; + } } } -- 1.7.9.2