localed: consider an unset model as a wildcard

diff --git a/src/locale/localed.c b/src/locale/localed.c
index e3061c8d5ea46ea6187c790f519f4ce6d2bd619b..358f6c200eef31372cafbbf44c9e7aac8b7ddd77 100644 (file)
--- 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++;
 
                                 matching++;
 

-                                if (streq_ptr(c->x11_options, a[4]))
+                                if (streq_ptr(c->x11_variant, a[3])) {

                                         matching++;
                                         matching++;

+
+                                        if (streq_ptr(c->x11_options, a[4]))
+                                                matching++;
+                                }

                         }
                 }
 
                         }
                 }