From 983cef48027f1bdf651c19d72cf615cf4345dbe6 Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Sun, 27 Oct 2013 21:52:01 +0100
Subject: [PATCH] payment-request UI: use SendCoinsRecipient.message for memo

---
 src/qt/paymentserver.cpp  | 2 +-
 src/qt/sendcoinsentry.cpp | 4 ++--
 src/qt/walletmodel.h      | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 50847c4c48..c113c0ff13 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -450,7 +450,7 @@ bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, QList<Sen
     recipients.append(SendCoinsRecipient());
 
     recipients[0].paymentRequest = request;
-    recipients[0].label = GUIUtil::HtmlEscape(request.getDetails().memo()); // Todo: Change to .message once available
+    recipients[0].message = GUIUtil::HtmlEscape(request.getDetails().memo());
 
     request.getMerchant(PaymentServer::certStore, recipients[0].authenticatedMerchant);
 
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index e833274256..f312c9f72f 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -171,7 +171,7 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
         if (recipient.authenticatedMerchant.isEmpty()) // insecure
         {
             ui->payTo_is->setText(recipient.address);
-            ui->memoTextLabel_is->setText(recipient.label);
+            ui->memoTextLabel_is->setText(recipient.message);
             ui->payAmount_is->setValue(recipient.amount);
             ui->payAmount_is->setReadOnly(true);
             setCurrentWidget(ui->SendCoins_InsecurePaymentRequest);
@@ -179,7 +179,7 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
         else // secure
         {
             ui->payTo_s->setText(recipient.authenticatedMerchant);
-            ui->memoTextLabel_s->setText(recipient.label);
+            ui->memoTextLabel_s->setText(recipient.message);
             ui->payAmount_s->setValue(recipient.amount);
             ui->payAmount_s->setReadOnly(true);
             setCurrentWidget(ui->SendCoins_SecurePaymentRequest);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 59227bb743..467c3dea12 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -31,10 +31,9 @@ public:
     // payment requests, we can abuse it for displaying an address list.
     // Todo: This is a hack, should be replaced with a cleaner solution!
     QString address;
-    // If from a payment request, this is used for storing the memo
-    // Todo: This is a hack, should be replaced with a cleaner solution!
     QString label;
     qint64 amount;
+    // If from a payment request, this is used for storing the memo
     QString message;
 
     // If from a payment request, paymentRequest.IsInitialized() will be true