fix another FIXME

1 files changed, 41 insertions, 9 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index f936d54e..dcd936e7 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -4654,23 +4654,55 @@ TALER_MERCHANT_tip_pickup_cancel (struct TALER_MERCHANT_TipPickupHandle *tph);
 struct TALER_MERCHANT_TipPickup2Handle;
 
 
-// FIXME: change signature!
+/**
+ * Response for a POST /tips/$TIP_ID/pickup request.
+ */
+struct TALER_MERCHANT_TipPickup2Response
+{
+  /**
+   * HTTP response details
+   */
+  struct TALER_MERCHANT_HttpResponse hr;
+
+  /**
+   * Details depending on status.
+   */
+  union
+  {
+
+    /**
+     * Details if status is #MHD_HTTP_OK.
+     */
+    struct
+    {
+
+      /**
+       * length of the @a blind_sigs array
+       */
+      unsigned int num_blind_sigs;
+
+      /**
+       * array of blind signatures over the planchets
+       */
+      const struct TALER_BlindedDenominationSignature *blind_sigs;
+
+    } ok;
+
+  } details;
+};
+
+
 /**
  * Callback for a POST /tips/$TIP_ID/pickup request.  Returns the result of
- * the operation.  Note that the client MUST still do the unblinding of the @a
- * blind_sigs.
+ * the operation.  Note that the client MUST still do the unblinding.
  *
  * @param cls closure
- * @param hr HTTP response details
- * @param num_blind_sigs length of the @a blind_sigs array, 0 on error
- * @param blind_sigs array of blind signatures over the planchets, NULL on error
+ * @param tpr response details
  */
 typedef void
 (*TALER_MERCHANT_TipPickup2Callback) (
   void *cls,
-  const struct TALER_MERCHANT_HttpResponse *hr,
-  unsigned int num_blind_sigs,
-  const struct TALER_BlindedDenominationSignature blind_sigs[]);
+  const struct TALER_MERCHANT_TipPickup2Response *tpr);
 
 
 /**