diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:04:35 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:06:12 +0100 |
commit | b6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch) | |
tree | b29517e7aee281484ea960b92f53a6c13269904c /src/lib/exchange_api_wire.c | |
parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) | |
download | exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.xz |
fix merge conflict
Diffstat (limited to 'src/lib/exchange_api_wire.c')
-rw-r--r-- | src/lib/exchange_api_wire.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c index 60ab4a6d1..9d17f5c80 100644 --- a/src/lib/exchange_api_wire.c +++ b/src/lib/exchange_api_wire.c @@ -271,7 +271,7 @@ handle_wire_finished (void *cls, struct TALER_EXCHANGE_WireAccount *wa = &was[i]; json_t *account; struct GNUNET_JSON_Specification spec_account[] = { - GNUNET_JSON_spec_string ("url", &wa->url), + GNUNET_JSON_spec_string ("payto_uri", &wa->payto_uri), GNUNET_JSON_spec_fixed_auto ("master_sig", &wa->master_sig), GNUNET_JSON_spec_end () }; @@ -300,7 +300,7 @@ handle_wire_finished (void *cls, ec = TALER_EC_SERVER_JSON_INVALID; break; } - if (NULL == (method = TALER_payto_get_method (wa->url))) + if (NULL == (method = TALER_payto_get_method (wa->payto_uri))) { /* bogus reply */ GNUNET_break_op (0); |