[systemd-devel] [PATCH] localed: consider an unset model as a wildcard

[Michal Sekletar]

On Fri, May 30, 2014 at 06:20:16PM +0200, Michal Sekletar wrote:

ping?

> ---
>  src/locale/localed.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/src/locale/localed.c b/src/locale/localed.c
> index e3061c8..358f6c2 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++;
> +                                }
>                          }
>                  }
>  
> -- 
> 1.9.0
>