diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-22 08:30:54 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-22 08:31:06 +0100 |
| commit | 39fae6cfddb78d2aefa81a48472f885253cc42f1 (patch) | |
| tree | 1a5685133af5129c1373cc9fdec974bc0d1e9f46 | |
| parent | 76a77059f361f3c700a550c11adf567bafebbd00 (diff) | |
| parent | b96f6a77f8a33fe39f480d4b1c617b7ba57d61b8 (diff) | |
Merge pull request #3720
b96f6a7 Remove "conflicted" as transaction category. (Wladimir J. van der Laan)
| -rw-r--r-- | src/rpcwallet.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 3b0c84e49e..7b605af589 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1114,10 +1114,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe Object entry; entry.push_back(Pair("account", strSentAccount)); MaybePushAddress(entry, s.first); - if (wtx.GetDepthInMainChain() < 0) - entry.push_back(Pair("category", "conflicted")); - else - entry.push_back(Pair("category", "send")); + entry.push_back(Pair("category", "send")); entry.push_back(Pair("amount", ValueFromAmount(-s.second))); entry.push_back(Pair("fee", ValueFromAmount(-nFee))); if (fLong) @@ -1150,10 +1147,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe } else { - if (wtx.GetDepthInMainChain() < 0) - entry.push_back(Pair("category", "conflicted")); - else - entry.push_back(Pair("category", "receive")); + entry.push_back(Pair("category", "receive")); } entry.push_back(Pair("amount", ValueFromAmount(r.second))); if (fLong) |