resolving merge issue

1 files changed, 7 insertions, 2 deletions

diff --git a/src/exchange-lib/exchange_api_refresh.c b/src/exchange-lib/exchange_api_refresh.c
index 6d12a718..c3216a6e 100644
--- a/src/exchange-lib/exchange_api_refresh.c
+++ b/src/exchange-lib/exchange_api_refresh.c
@@ -28,7 +28,6 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
-#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 
@@ -1115,6 +1114,7 @@ handle_refresh_melt_finished (void *cls,
     {
       rmh->melt_cb (rmh->melt_cb_cls,
                     response_code,
+		    TALER_JSON_get_error_code (json),
                     noreveal_index,
                     (0 == response_code) ? NULL : &exchange_pub,
                     json);
@@ -1160,6 +1160,7 @@ handle_refresh_melt_finished (void *cls,
   if (NULL != rmh->melt_cb)
     rmh->melt_cb (rmh->melt_cb_cls,
                   response_code,
+		  TALER_JSON_get_error_code (json),
                   UINT16_MAX,
                   NULL,
                   json);
@@ -1598,6 +1599,7 @@ handle_refresh_reveal_finished (void *cls,
       {
         rrh->reveal_cb (rrh->reveal_cb_cls,
                         MHD_HTTP_OK,
+			TALER_EC_NONE,
                         rrh->md->num_fresh_coins,
                         coin_privs,
                         sigs,
@@ -1634,7 +1636,10 @@ handle_refresh_reveal_finished (void *cls,
   if (NULL != rrh->reveal_cb)
     rrh->reveal_cb (rrh->reveal_cb_cls,
                     response_code,
-                    0, NULL, NULL,
+		    TALER_JSON_get_error_code (json),
+		    0,
+		    NULL,
+		    NULL,
                     json);
   TALER_EXCHANGE_refresh_reveal_cancel (rrh);
 }