diff options
author | Daniel Stone <daniel@fooishbar.org> | 2012-05-11 15:03:43 +0100 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2012-05-11 15:03:43 +0100 |
commit | 7b00485a6bc2facdb56ccdaa12b4900f118d66b5 (patch) | |
tree | 33b821b995483ddc43a376d56694d6280545e257 /test/rulescomp.c | |
parent | f95b41131d4c1815ee4643f5addb1d2d1ad68728 (diff) |
Rename 'ctx' back to 'context' in external API
Still keep things as 'ctx' internally so we don't have to worry about
typing it too often, but rename the user-visible API back as it was
kinda ugly.
This partially reverts e7bb1e5f.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'test/rulescomp.c')
-rw-r--r-- | test/rulescomp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/rulescomp.c b/test/rulescomp.c index 403ff65..fbf335d 100644 --- a/test/rulescomp.c +++ b/test/rulescomp.c @@ -33,7 +33,7 @@ static int test_rmlvo(const char *rules, const char *model, const char *layout, const char *variant, const char *options) { - struct xkb_ctx *ctx; + struct xkb_context *context; struct xkb_keymap *keymap; struct xkb_rule_names rmlvo = { .rules = rules, @@ -43,20 +43,20 @@ test_rmlvo(const char *rules, const char *model, const char *layout, .options = options }; - ctx = xkb_ctx_new(0); - assert(ctx); + context = xkb_context_new(0); + assert(context); fprintf(stderr, "\nCompiling %s %s %s %s %s\n", rmlvo.rules, rmlvo.model, rmlvo.layout, rmlvo.variant, rmlvo.options); - keymap = xkb_map_new_from_names(ctx, &rmlvo, 0); + keymap = xkb_map_new_from_names(context, &rmlvo, 0); if (!keymap) { - xkb_ctx_unref(ctx); + xkb_context_unref(context); return 0; } xkb_map_unref(keymap); - xkb_ctx_unref(ctx); + xkb_context_unref(context); return 1; } |