diff options
| author | Ronan Pigott <ronan@rjp.ie> | 2022-12-16 01:26:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 10:26:25 +0200 |
| commit | b4e81ca17240281fc802a662f5ce4e78a767c2b9 (patch) | |
| tree | e8b622bdcce814fa82ba885512074ca2a5cc12f0 /src/compose/table.c | |
| parent | 9d1043dcb5c698c5d9615b1b8d76a190f73d57bb (diff) | |
| download | xorg-lib-libxkbcommon-b4e81ca17240281fc802a662f5ce4e78a767c2b9.tar.gz | |
context: add XKB_CONTEXT_NO_SECURE_GETENV flag (#312)
This flag is useful for clients that may have relatively benign capabilities
set, like CAP_SYS_NICE, that also want to use the xkb configuration from the
environment and user configs in XDG_CONFIG_HOME.
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/308
Fixes: https://github.com/xkbcommon/libxkbcommon/issues/129
Signed-off-by: Ran Benita <ran@unusedvar.com>
Diffstat (limited to 'src/compose/table.c')
| -rw-r--r-- | src/compose/table.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compose/table.c b/src/compose/table.c index 8a8d11f..ea5e45a 100644 --- a/src/compose/table.c +++ b/src/compose/table.c @@ -38,7 +38,7 @@ xkb_compose_table_new(struct xkb_context *ctx, struct xkb_compose_table *table; struct compose_node dummy; - resolved_locale = resolve_locale(locale); + resolved_locale = resolve_locale(ctx, locale); if (!resolved_locale) return NULL; @@ -174,7 +174,7 @@ xkb_compose_table_new_from_locale(struct xkb_context *ctx, if (!table) return NULL; - path = get_xcomposefile_path(); + path = get_xcomposefile_path(ctx); if (path) { file = fopen(path, "rb"); if (file) @@ -182,7 +182,7 @@ xkb_compose_table_new_from_locale(struct xkb_context *ctx, } free(path); - path = get_xdg_xcompose_file_path(); + path = get_xdg_xcompose_file_path(ctx); if (path) { file = fopen(path, "rb"); if (file) @@ -190,7 +190,7 @@ xkb_compose_table_new_from_locale(struct xkb_context *ctx, } free(path); - path = get_home_xcompose_file_path(); + path = get_home_xcompose_file_path(ctx); if (path) { file = fopen(path, "rb"); if (file) @@ -198,7 +198,7 @@ xkb_compose_table_new_from_locale(struct xkb_context *ctx, } free(path); - path = get_locale_compose_file_path(table->locale); + path = get_locale_compose_file_path(ctx, table->locale); if (path) { file = fopen(path, "rb"); if (file) |