diff options
| author | Philip Kaufmann <[email protected]> | 2012-12-03 13:51:58 +0100 |
|---|---|---|
| committer | Philip Kaufmann <[email protected]> | 2012-12-04 21:35:41 +0100 |
| commit | 15d8ff20294d20e6b11ec54450943eb7c5282ae0 (patch) | |
| tree | ff05c76b04aea748285cdaa799f32b9b5fd11e78 /src/qt | |
| parent | remove unneeded flag from MSG_INFORMATION and fix an indentation (diff) | |
| download | discoin-15d8ff20294d20e6b11ec54450943eb7c5282ae0.tar.xz discoin-15d8ff20294d20e6b11ec54450943eb7c5282ae0.zip | |
rework ThreadSafeAskFee() / askFee() functions
- remove unused parameter from ThreadSafeAskFee(), which also results in
the removal of an orphan translation-string
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 3 | ||||
| -rw-r--r-- | src/qt/walletmodel.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 95d956dd8..dbdfade0b 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -54,12 +54,13 @@ static void ThreadSafeMessageBox(const std::string& message, const std::string& } } -static bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption) +static bool ThreadSafeAskFee(int64 nFeeRequired) { if(!guiref) return false; if(nFeeRequired < MIN_TX_FEE || nFeeRequired <= nTransactionFee || fDaemon) return true; + bool payFee = false; QMetaObject::invokeMethod(guiref, "askFee", GUIUtil::blockingGUIThreadConnection(), diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 3568616cd..9d5a2c04f 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -189,7 +189,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie } return TransactionCreationFailed; } - if(!uiInterface.ThreadSafeAskFee(nFeeRequired, tr("Sending...").toStdString())) + if(!uiInterface.ThreadSafeAskFee(nFeeRequired)) { return Aborted; } |