diff options
| author | langerhans <[email protected]> | 2014-05-04 16:43:27 +0200 |
|---|---|---|
| committer | langerhans <[email protected]> | 2014-05-04 16:43:27 +0200 |
| commit | 9b3def818a038c3af67ffe07803149c1f2e21b6b (patch) | |
| tree | d933d8ee53f6bff8d856f0c6c5c9c070d040d0f1 /src | |
| parent | Merge pull request #505 from patricklodder/1.7-dev-qt-nl (diff) | |
| parent | Changing the progress display to match 3 confirms (diff) | |
| download | discoin-9b3def818a038c3af67ffe07803149c1f2e21b6b.tar.xz discoin-9b3def818a038c3af67ffe07803149c1f2e21b6b.zip | |
Merge pull request #502 from patricklodder/1.7-dev-3-req-conf
3 'required' confirmations for Qt
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/dogecoin.qrc | 4 | ||||
| -rw-r--r-- | src/qt/transactionrecord.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/dogecoin.qrc b/src/qt/dogecoin.qrc index 4cf060a6e..70775ea68 100644 --- a/src/qt/dogecoin.qrc +++ b/src/qt/dogecoin.qrc @@ -13,8 +13,8 @@ <file alias="transaction_0">res/icons/transaction0.png</file> <file alias="transaction_confirmed">res/icons/transaction2.png</file> <file alias="transaction_conflicted">res/icons/transaction_conflicted.png</file> - <file alias="transaction_1">res/icons/clock1.png</file> - <file alias="transaction_2">res/icons/clock2.png</file> + <file alias="transaction_1">res/icons/clock2.png</file> + <file alias="transaction_2">res/icons/clock4.png</file> <file alias="transaction_3">res/icons/clock3.png</file> <file alias="transaction_4">res/icons/clock4.png</file> <file alias="transaction_5">res/icons/clock5.png</file> diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index af6fd403b..1e669127a 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -79,7 +79,7 @@ public: }; /** Number of confirmation recommended for accepting a transaction */ - static const int RecommendedNumConfirmations = 6; + static const int RecommendedNumConfirmations = 3; TransactionRecord(): hash(), time(0), type(Other), address(""), debit(0), credit(0), idx(0) |