[PATCH libxkbcommon 2/2] src/context: Remove ~/.xkb from search path

Peter Hutterer peter.hutterer at who-t.net
Tue Nov 22 03:14:46 UTC 2016


On Thu, Nov 17, 2016 at 10:44:12PM +0500, Mihail Konev wrote:
> Signed-off-by: Mihail Konev <k.mvc at ya.ru>
> ---
>  src/context.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/src/context.c b/src/context.c
> index e9e939b6b0eb..c9879a834074 100644
> --- a/src/context.c
> +++ b/src/context.c
> @@ -76,7 +76,7 @@ XKB_EXPORT int
>  xkb_context_include_path_append_default(struct xkb_context *ctx)
>  {
>      const char *home, *root, *xdg;
> -    char *user_path, *xdg_path = NULL;
> +    char *xdg_path = NULL;
>      int err;
>      int ret = 0;
>  
> @@ -107,12 +107,6 @@ xkb_context_include_path_append_default(struct xkb_context *ctx)
>          free(xdg_path);
>      }
>  
> -    err = asprintf(&user_path, "%s/.xkb", home);
> -    if (err <= 0)
> -        return ret;
> -    ret |= xkb_context_include_path_append(ctx, user_path);
> -    free(user_path);

Ran has the final say here but this has always been part of libxkbcommon.
while i'm all for removing it and replacing it with the xdg dirs, this may
break existing setups.

Cheers,
   Peter
> -
>      return ret;
>  }
>  
> -- 
> 2.9.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list