-minor cleanup issues

2 files changed, 44 insertions, 25 deletions

diff --git a/src/taler-mdb.c b/src/taler-mdb.c
index cba7cb3..58cc89f 100644
--- a/src/taler-mdb.c
+++ b/src/taler-mdb.c
@@ -256,7 +256,7 @@ along with
 struct MdbBlock
 {
   /**
-   * Data containing a mdb command or the data of an mdb command
+   * Data containing an mdb command or the data of an mdb command
    */
   uint8_t *bin;
 
@@ -1014,11 +1014,15 @@ cleanup_payment (struct PaymentActivity *pa)
     return;
   }
   if (NULL != pa->odh)
+  {
     TALER_MERCHANT_order_delete_cancel (pa->odh);
+    pa->odh = NULL;
+  }
   if (NULL != pa->pnd)
   {
     nfc_abort_command (pa->pnd);
     nfc_close (pa->pnd);
+    pa->pnd = NULL;
   }
   if (NULL != cancelbutton_task)
   {
@@ -1028,16 +1032,31 @@ cleanup_payment (struct PaymentActivity *pa)
     cancelbutton_task = NULL;
   }
   if (NULL != pa->po)
+  {
     TALER_MERCHANT_orders_post_cancel (pa->po);
+    pa->po = NULL;
+  }
   if (NULL != pa->ogh)
+  {
     TALER_MERCHANT_merchant_order_get_cancel (pa->ogh);
+    pa->ogh = NULL;
+  }
   GNUNET_CURL_gnunet_scheduler_reschedule (&pa->rc);
   if (NULL != pa->task)
+  {
     GNUNET_SCHEDULER_cancel (pa->task);
+    pa->task = NULL;
+  }
   if (NULL != pa->delay_task)
+  {
     GNUNET_SCHEDULER_cancel (pa->delay_task);
+    pa->delay_task = NULL;
+  }
   if (NULL != pa->delay_pay_task)
+  {
     GNUNET_SCHEDULER_cancel (pa->delay_pay_task);
+    pa->delay_pay_task = NULL;
+  }
   if (NULL != pa->taler_pay_uri)
   {
 #if HAVE_QRENCODE_H
diff --git a/taler.conf b/taler.conf
index b114488..b133ec5 100644
--- a/taler.conf
+++ b/taler.conf
@@ -1,6 +1,6 @@
 [taler-mdb]
-BACKEND-BASE-URL = http://backend.test.taler.net/
-BACKEND-AUTHORIZATION = ApiKey Sandbox
+BACKEND-BASE-URL = https://backend.demo.taler.net/instances/Taler/
+BACKEND-AUTHORIZATION = Bearer secret-token:secret
 # Message to diplay after purchase is completed,
 fulfillment-msg = Enjoy your ${PRODUCT_DESCRIPTION}
 
@@ -20,7 +20,7 @@ ESSID = snack
 #machine number 55
 [product-21]
 description = empty
-price = EUR:0.0
+price = KUDOS:0.0
 number = 46
 # instance = http://backend.test.taler.net/instances/foo/
 # NOTE: authorization key MUST match the one from [taler-mdb]!
@@ -28,138 +28,138 @@ number = 46
 #machine number 54
 [product-20]
 description = empty
-price = EUR:0.0
+price = KUDOS:0.0
 number = 45
 
 #machine number 53
 [product-19]
 description = Hackerspace Passport
-price = EUR:1.0
+price = KUDOS:1.0
 number = 44
 
 #machine number 52
 [product-18]
 description = T-Shirt M
-price = EUR:5.0
+price = KUDOS:5.0
 number = 43
 
 #machine number 51
 [product-17]
 description = T-Shirt S
-price = EUR:5.0
+price = KUDOS:5.0
 number = 42
 
 #machine number 50
 [product-16]
 description = Electronic Kit
-price = EUR:10.0
+price = KUDOS:10.0
 number = 41
 
 #machine number 45
 [product-15]
 description = Snickers
-price = EUR:0.3
+price = KUDOS:0.3
 number = 36
 
 #machine number 44
 [product-14]
 description = Electronic Kit
-price = EUR:7.0
+price = KUDOS:7.0
 number = 35
 
 #machine number 43
 [product-13]
 description = empty
-price = EUR:0.0
+price = KUDOS:0.0
 key = d
 number = 34
 
 #machine number 42
 [product-12]
 description = Screwdriver
-price = EUR:15.0
+price = KUDOS:15.0
 key = h
 number = 33
 
 #machine number 41
 [product-11]
 description = Twix
-price = EUR:0.3
+price = KUDOS:0.3
 key = j
 number = 32
 
 #machine number 40
 [product-10]
 description = Mars
-price = EUR:0.3
+price = KUDOS:0.3
 key = k
 number = 31
 
 #machine number 34
 [product-9]
 description = Book GRM - Brainfuck
-price = EUR:25.0
+price = KUDOS:25.0
 key = l
 number = 25
 
 #machine number 30
 [product-8]
 description = Ruler
-price = EUR:10.0
+price = KUDOS:10.0
 key = w
 number = 21
 
 #machine number 25
 [product-7]
 description = NFC TAG
-price = EUR:1.0
+price = KUDOS:1.0
 key = e
 number = 16
 
 #machine number 24
 [product-6]
 description = Knive
-price = EUR:25.0
+price = KUDOS:25.0
 key = r
 number = 15
 
 #machine number 23
 [product-5]
 description = Electronic Kit
-price = EUR:5.0
+price = KUDOS:5.0
 key = t
 number = 14
 
 #machine number 22
 [product-4]
 description = empty
-price = EUR:0.0
+price = KUDOS:0.0
 key = z
 number = 13
 
 #machine number 21
 [product-3]
 description = empty
-price = EUR:0.0
+price = KUDOS:0.0
 key = u
 number = 12
 
 #machine number 20
 [product-2]
 description = Gummy bears
-price = EUR:0.3
+price = KUDOS:0.3
 key = i
 number = 11
 
 #machine number 14
 [product-1]
 description = Sword
-price = EUR:0.05
+price = KUDOS:0.05
 number = 5
 
 #machine number 10
 [product-0]
 description = Umbrella
-price = EUR:10.0
+price = KUDOS:10.0
 key = p
 number = 1