aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sekletar <msekleta@redhat.com>2014-05-30 18:20:16 +0200
committerLennart Poettering <lennart@poettering.net>2014-07-02 16:11:50 +0200
commit387066c2e5bda159201896b194711965b52f34a9 (patch)
tree70494352df48c3fe00cb469bb15098e6ef6545be
parentsd-dhcp6-client: initialize variable (diff)
downloadsystemd-387066c2e5bda159201896b194711965b52f34a9.tar.gz
systemd-387066c2e5bda159201896b194711965b52f34a9.tar.bz2
systemd-387066c2e5bda159201896b194711965b52f34a9.zip
localed: consider an unset model as a wildcard
-rw-r--r--src/locale/localed.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/locale/localed.c b/src/locale/localed.c
index e3061c8d5..358f6c200 100644
--- a/src/locale/localed.c
+++ b/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++;
+ }
}
}