Blame SOURCES/0281-localed-consider-an-unset-model-as-a-wildcard.patch
|
 |
84b277 |
From a27bc4778ef4579a954846cb75435226655ad31a Mon Sep 17 00:00:00 2001
|
|
|
84b277 |
From: Michal Sekletar <msekleta@redhat.com>
|
|
|
84b277 |
Date: Fri, 30 May 2014 18:20:16 +0200
|
|
|
84b277 |
Subject: [PATCH] localed: consider an unset model as a wildcard
|
|
|
84b277 |
|
|
|
84b277 |
(cherry picked from commit 387066c2e5bda159201896b194711965b52f34a9)
|
|
|
84b277 |
|
|
|
84b277 |
Conflicts:
|
|
|
84b277 |
src/locale/localed.c
|
|
|
84b277 |
|
|
|
84b277 |
Resolves: #903776
|
|
|
84b277 |
---
|
|
|
84b277 |
src/locale/localed.c | 13 +++++++------
|
|
|
84b277 |
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
84b277 |
|
|
|
84b277 |
diff --git a/src/locale/localed.c b/src/locale/localed.c
|
|
|
84b277 |
index b9b98f4..a93b309 100644
|
|
|
84b277 |
--- a/src/locale/localed.c
|
|
|
84b277 |
+++ b/src/locale/localed.c
|
|
|
84b277 |
@@ -871,15 +871,16 @@ static int find_legacy_keymap(char **new_keymap) {
|
|
|
84b277 |
}
|
|
|
84b277 |
}
|
|
|
84b277 |
|
|
|
84b277 |
- if (matching > 0 &&
|
|
|
84b277 |
- streq_ptr(state.x11_model, a[2])) {
|
|
|
84b277 |
- matching++;
|
|
|
84b277 |
-
|
|
|
84b277 |
- if (streq_ptr(state.x11_variant, a[3])) {
|
|
|
84b277 |
+ if (matching > 0) {
|
|
|
84b277 |
+ if (isempty(state.x11_model) || streq_ptr(state.x11_model, a[2])) {
|
|
|
84b277 |
matching++;
|
|
|
84b277 |
|
|
|
84b277 |
- if (streq_ptr(state.x11_options, a[4]))
|
|
|
84b277 |
+ if (streq_ptr(state.x11_variant, a[3])) {
|
|
|
84b277 |
matching++;
|
|
|
84b277 |
+
|
|
|
84b277 |
+ if (streq_ptr(state.x11_options, a[4]))
|
|
|
84b277 |
+ matching++;
|
|
|
84b277 |
+ }
|
|
|
84b277 |
}
|
|
|
84b277 |
}
|
|
|
84b277 |
|