From 03535acd053fc0597a9e1fd76c5c7b1f54f5c1df Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Fri, 18 Oct 2013 13:44:27 +0200
Subject: [PATCH] qt: add message field to SendCoinsRecipient

Also update URI parsing to fill in this field.
Note that the message is not currently used in any way with the client.
It should be stored with the transaction.
---
 src/qt/guiutil.cpp       | 5 +++++
 src/qt/test/uritests.cpp | 3 +--
 src/qt/walletmodel.h     | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index b65348548..e7334e67c 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -112,6 +112,11 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
             rv.label = i->second;
             fShouldReturnFalse = false;
         }
+        if (i->first == "message")
+        {
+            rv.message = i->second;
+            fShouldReturnFalse = false;
+        }
         else if (i->first == "amount")
         {
             if(!i->second.isEmpty())
diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp
index 802d74719..df4df3154 100644
--- a/src/qt/test/uritests.cpp
+++ b/src/qt/test/uritests.cpp
@@ -50,9 +50,8 @@ void URITests::uriTests()
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.label == QString());
 
-    // We currently don't implement the message parameter (ok, yea, we break spec...)
     uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-message=Wikipedia Example Address"));
-    QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
+    QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
 
     uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000&label=Wikipedia Example"));
     QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 6abcdaf8c..2e99eaddc 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -21,11 +21,14 @@ QT_END_NAMESPACE
 class SendCoinsRecipient
 {
 public:
-    SendCoinsRecipient() : amount(0) { }
+    explicit SendCoinsRecipient() : amount(0) { }
+    explicit SendCoinsRecipient(const QString &addr, const QString &label, quint64 amount, const QString &message):
+        address(addr), label(label), amount(amount), message(message) {}
 
     QString address;
     QString label;
     qint64 amount;
+    QString message;
 
     // If from a payment request, paymentRequest.IsInitialized() will be true
     PaymentRequestPlus paymentRequest;