Browse Source

qt: status WalletModel::Aborted is no longer used

Aborting transactions happens in the GUI now as it should,
not the backend.
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
4a61c39456
  1. 3
      src/qt/sendcoinsdialog.cpp
  2. 5
      src/qt/walletmodel.h

3
src/qt/sendcoinsdialog.cpp

@ -452,9 +452,8 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
msgParams.first = tr("The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."); msgParams.first = tr("The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.");
msgParams.second = CClientUIInterface::MSG_ERROR; msgParams.second = CClientUIInterface::MSG_ERROR;
break; break;
// OK and Aborted are included to prevent a compiler warning. // included to prevent a compiler warning.
case WalletModel::OK: case WalletModel::OK:
case WalletModel::Aborted:
default: default:
return; return;
} }

5
src/qt/walletmodel.h

@ -75,8 +75,7 @@ public:
AmountWithFeeExceedsBalance, AmountWithFeeExceedsBalance,
DuplicateAddress, DuplicateAddress,
TransactionCreationFailed, // Error returned when wallet is still locked TransactionCreationFailed, // Error returned when wallet is still locked
TransactionCommitFailed, TransactionCommitFailed
Aborted
}; };
enum EncryptionStatus enum EncryptionStatus
@ -103,7 +102,7 @@ public:
// Return status record for SendCoins, contains error id + information // Return status record for SendCoins, contains error id + information
struct SendCoinsReturn struct SendCoinsReturn
{ {
SendCoinsReturn(StatusCode status = Aborted): SendCoinsReturn(StatusCode status = OK):
status(status) {} status(status) {}
StatusCode status; StatusCode status;
}; };

Loading…
Cancel
Save