diff options
| author | Gregory Maxwell <greg@xiph.org> | 2012-08-23 16:31:45 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2012-08-23 16:31:45 -0700 |
| commit | 0050cf21ce2a3a3c032817e661f813ccaf25f430 (patch) | |
| tree | 1cd125441785b823b1a87bba9d10c407943f6864 /src/wallet.h | |
| parent | 1bcd3f26c022f7a2fcc1a01df6d9cae0cb13f8d7 (diff) | |
| parent | e07c8e9123aa87b7d49c08a7558ea5af63bfcb74 (diff) | |
| download | bitcoin-0050cf21ce2a3a3c032817e661f813ccaf25f430.tar.xz | |
Merge pull request #1409 from luke-jr/listtx_generate_fold
Treat generation (mined) transactions less different from receive transactions
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.h b/src/wallet.h index 9103aa675e..69badaf10d 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -589,10 +589,10 @@ public: return nChangeCached; } - void GetAmounts(int64& nGeneratedImmature, int64& nGeneratedMature, std::list<std::pair<CTxDestination, int64> >& listReceived, + void GetAmounts(std::list<std::pair<CTxDestination, int64> >& listReceived, std::list<std::pair<CTxDestination, int64> >& listSent, int64& nFee, std::string& strSentAccount) const; - void GetAccountAmounts(const std::string& strAccount, int64& nGenerated, int64& nReceived, + void GetAccountAmounts(const std::string& strAccount, int64& nReceived, int64& nSent, int64& nFee) const; bool IsFromMe() const |