[taler-taler-mdb] branch master updated (87c0b62 -> 9ef5d9c)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository taler-mdb.

    from 87c0b62  bump version
     new 0b00784  API rename in merchant
     new 9ef5d9c  adapt to merchant API change

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main.c b/src/main.c
index 9de8392..bf9a7eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -331,7 +331,7 @@ struct PaymentActivity
   /**
    * Handle to a POST /orders operation
    */
-  struct TALER_MERCHANT_PostOrdersOperation *po;
+  struct TALER_MERCHANT_PostOrdersHandle *po;
 
   /**
    * Handle for a GET /private/orders/$ID operation.
@@ -1478,27 +1478,24 @@ check_payment_again (void *cls)
  * @brief Callback for a POST /orders request
  *
  * @param cls closure
- * @param hr HTTP response for this request
- * @param order_id order ID of the order created
- * @param token the claim token generated by the merchant (NULL if
- *        it wasn't generated).
+ * @param por response for this request
  */
 static void
 proposal_cb (void *cls,
-             const struct TALER_MERCHANT_HttpResponse *hr,
-             const char *order_id,
-             const struct TALER_ClaimTokenP *token)
+             const struct TALER_MERCHANT_PostOrdersReply *por)
 {
   struct PaymentActivity *pa = cls;
 
   pa->po = NULL;
-  if (MHD_HTTP_OK != hr->http_status)
+  if (MHD_HTTP_OK != por->hr.http_status)
   {
+    /* FIXME: In the future, we may want to support MHD_HTTP_GONE
+       explicitly and show 'product out of stock' here! */
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to setup order with backend: %u/%d\n",
-                hr->http_status,
-                (int) hr->ec);
-    json_dumpf (hr->reply,
+                por->hr.http_status,
+                (int) por->hr.ec);
+    json_dumpf (por->hr.reply,
                 stderr,
                 0);
     mdb.cmd = &cmd_reader_display_backend_not_reachable;
@@ -1510,8 +1507,8 @@ proposal_cb (void *cls,
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Backend successfully created order `%s'\n",
-              order_id);
-  pa->order_id = GNUNET_strdup (order_id);
+              por->details.ok.order_id);
+  pa->order_id = GNUNET_strdup (por->details.ok.order_id);
   pa->ogh = TALER_MERCHANT_merchant_order_get (ctx,
                                                pa->base_url,
                                                pa->order_id,
@@ -1524,7 +1521,7 @@ proposal_cb (void *cls,
 
 
 static void
-start_read_cancel_button ();
+start_read_cancel_button (void);
 
 /**
  * @brief Launch a new order

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.