diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-10-15 03:14:23 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-10-15 03:14:23 +0200 |
| commit | 9f8b9743f382ee627439634369788489248c9a41 (patch) | |
| tree | 01299695ad9601a3c3e75bd40249880ef163db22 /src/backend/taler-merchant-httpd_track-transaction.c | |
| parent | ff8fdfa0ec4f617993d385bb4258fb0538156c20 (diff) | |
| parent | 521aa89e5bca18cab12d8872bfccea5de11f48ce (diff) | |
| download | merchant-9f8b9743f382ee627439634369788489248c9a41.tar.gz merchant-9f8b9743f382ee627439634369788489248c9a41.tar.bz2 merchant-9f8b9743f382ee627439634369788489248c9a41.zip | |
resolving merge conflict with Marcello, mostly exactly the same changes
Diffstat (limited to 'src/backend/taler-merchant-httpd_track-transaction.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_track-transaction.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c b/src/backend/taler-merchant-httpd_track-transaction.c index c0387d80..ad0492b5 100644 --- a/src/backend/taler-merchant-httpd_track-transaction.c +++ b/src/backend/taler-merchant-httpd_track-transaction.c @@ -912,11 +912,11 @@ MH_handler_track_transaction (struct TMH_RequestHandler *rh, return TMH_RESPONSE_reply_internal_error (connection, "Database error"); } - ret = db->find_payments_by_id (db->cls, - transaction_id, - &tctx->mi->pubkey, - &coin_cb, - tctx); + ret = db->find_payments (db->cls, + transaction_id, + &tctx->mi->pubkey, + &coin_cb, + tctx); if (GNUNET_SYSERR == ret) { GNUNET_break (0); |