diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-27 21:44:55 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-27 21:44:55 +0200 |
| commit | b5b1d1a66b9f418c9fb293cb1cc3eac09a711c4e (patch) | |
| tree | 0efbb26069cf36cc64775ba0a50c62a7e7f644aa /src/qt | |
| parent | 7df001be9449bf99e720d6e750d282b77eda5a51 (diff) | |
| parent | a139ed74f2a5764afbd678c0e4eb6143455a3a49 (diff) | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
src/script.cpp
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/transactiondesc.cpp | 2 | ||||
| -rw-r--r-- | src/qt/transactionrecord.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 7f4bebb3fb..625b8e3f5e 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -211,7 +211,7 @@ string TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) { // Offline transaction CBitcoinAddress address; - if (ExtractAddress(txout.scriptPubKey, wallet, address)) + if (ExtractAddress(txout.scriptPubKey, 0, address)) { strHTML += _("<b>To:</b> "); if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].empty()) diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 50767d30fe..77c5a01260 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -138,7 +138,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet * // Sent to Bitcoin Address sub.type = TransactionRecord::SendToAddress; CBitcoinAddress address; - if (ExtractAddress(txout.scriptPubKey, wallet, address)) + if (ExtractAddress(txout.scriptPubKey, 0, address)) { sub.address = address.ToString(); } |