diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/Makefile.am | 20 | ||||
| -rw-r--r-- | src/client/libwebidoidc-client.c | 17 |
2 files changed, 21 insertions, 16 deletions
diff --git a/src/client/Makefile.am b/src/client/Makefile.am index f447adf..60035de 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -40,18 +40,22 @@ EXTRA_DIST += %reldir%/Disfluid-0.metadata %reldir%/disfluid-0-custom.vala CLEANFILES += %reldir%/vapi-generation -%reldir%/Disfluid-0.gir: %reldir%/Disfluid-0.h +AM_VALAFLAGS += \ + --vapidir=$(abs_top_srcdir)/%reldir% \ + --pkg=disfluid-0 + +$(srcdir)/%reldir%/Disfluid-0.gir: %reldir%/Disfluid-0.h $(AM_V_GEN) $(G_IR_SCANNER) -n Disfluid --nsversion=0 --header-only --warn-all -o $@-t $< - @mv $@-t $(srcdir)/$@ + @mv $@-t $@ -%reldir%/Disfluid-0.typelib: %reldir%/Disfluid-0.gir - $(AM_V_GEN) $(G_IR_COMPILER) -o $@-t --shared-library=libwebidoidc $(srcdir)/$< - @mv $@-t $(srcdir)/$@ +$(srcdir)/%reldir%/Disfluid-0.typelib: %reldir%/Disfluid-0.gir + $(AM_V_GEN) $(G_IR_COMPILER) -o $@-t --shared-library=libwebidoidc $< + @mv $@-t $@ -%reldir%/disfluid-0.vapi: %reldir%/Disfluid-0.gir %reldir%/Disfluid-0.metadata %reldir%/disfluid-0-custom.vala +$(srcdir)/%reldir%/disfluid-0.vapi: %reldir%/Disfluid-0.gir %reldir%/Disfluid-0.metadata %reldir%/disfluid-0-custom.vala @rm -rf %reldir%/vapi-generation @mkdir %reldir%/vapi-generation - $(AM_V_GEN) $(VAPIGEN) --library disfluid-0 -d %reldir%/vapi-generation $(srcdir)/$< --metadatadir=$(srcdir)/%reldir% $(srcdir)/%reldir%/disfluid-0-custom.vala + $(AM_V_GEN) $(VAPIGEN) --library disfluid-0 -d %reldir%/vapi-generation $< --metadatadir=$(srcdir)/%reldir% $(srcdir)/%reldir%/disfluid-0-custom.vala @mv %reldir%/vapi-generation/disfluid-0.vapi $@-t @rmdir %reldir%/vapi-generation - @mv $@-t $(srcdir)/$@ + @mv $@-t $@ diff --git a/src/client/libwebidoidc-client.c b/src/client/libwebidoidc-client.c index 46deecc..4937135 100644 --- a/src/client/libwebidoidc-client.c +++ b/src/client/libwebidoidc-client.c @@ -22,8 +22,8 @@ struct DisfluidApi { SCM scm_make_client; SCM scm_get_client_id; - SCM scm_get_key_pair; - SCM scm_get_redirect_uri; + SCM scm_get_client_jwk; + SCM scm_get_client_redirect_uri; SCM scm_make_account_full; SCM scm_get_account_subject; SCM scm_get_account_issuer; @@ -49,10 +49,11 @@ inner_guile (void *data) scm_c_public_ref ("webid-oidc client reverse-stubs", "make-client"); api.scm_get_client_id = scm_c_public_ref ("webid-oidc client reverse-stubs", "get-client-id"); - api.scm_get_key_pair = - scm_c_public_ref ("webid-oidc client reverse-stubs", "get-key-pair"); - api.scm_get_redirect_uri = - scm_c_public_ref ("webid-oidc client reverse-stubs", "get-redirect-uri"); + api.scm_get_client_jwk = + scm_c_public_ref ("webid-oidc client reverse-stubs", "get-client-jwk"); + api.scm_get_client_redirect_uri = + scm_c_public_ref ("webid-oidc client reverse-stubs", + "get-client-redirect-uri"); api.scm_make_account_full = scm_c_public_ref ("webid-oidc client reverse-stubs", "make-account-full"); api.scm_get_account_subject = @@ -167,7 +168,7 @@ disfluid_client_get_key_pair (const struct DisfluidClient *client, const struct DisfluidApi *api, size_t start, size_t max, char *jwk) { - SCM scm_jwk = scm_call_1 (api->scm_get_key_pair, client->object); + SCM scm_jwk = scm_call_1 (api->scm_get_client_jwk, client->object); return copy_scm_string (scm_jwk, start, max, jwk); } @@ -177,7 +178,7 @@ disfluid_client_get_redirect_uri (const struct DisfluidClient *client, size_t start, size_t max, char *redirect_uri) { - SCM scm_uri = scm_call_1 (api->scm_get_redirect_uri, client->object); + SCM scm_uri = scm_call_1 (api->scm_get_client_redirect_uri, client->object); return copy_scm_string (scm_uri, start, max, redirect_uri); } |