diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-10-24 16:02:39 +0200 |
|---|---|---|
| committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-10-31 17:51:12 +0100 |
| commit | c6c97e0f4e3d9d8d5b8a1e60174e9ff11e70b6c1 (patch) | |
| tree | 54c77e769e2c7e6a5d4a0e7a027dce9c3747a2c0 /src/qt/walletmodel.cpp | |
| parent | ede3ee3348ecaeed04dec587171e732ebc0830fd (diff) | |
| download | bitcoin-c6c97e0f4e3d9d8d5b8a1e60174e9ff11e70b6c1.tar.xz | |
[Qt] Rework of payment request UI (mainly for insecure pr)
- this shows insecure (unsecured) payment requests in a new yellowish
colored UI (based on the secure payment request UI) instead of our
normal payment UI
- allows us to receive paymentACK messages for insecure payment requests
- allows us to handle expirations for insecure payment request
- changed walletmodel, so that all types of payment requests don't touch
the addressbook
Diffstat (limited to 'src/qt/walletmodel.cpp')
| -rw-r--r-- | src/qt/walletmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 417bac9928..8086d6b5bb 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -258,8 +258,8 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran // and emit coinsSent signal for each recipient foreach(const SendCoinsRecipient &rcp, transaction.getRecipients()) { - // Don't touch the address book when we have a secure payment-request - if (rcp.authenticatedMerchant.isEmpty()) + // Don't touch the address book when we have a payment request + if (!rcp.paymentRequest.IsInitialized()) { std::string strAddress = rcp.address.toStdString(); CTxDestination dest = CBitcoinAddress(strAddress).Get(); |