tredefine do_send as a wrapper for send_tx - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 887557865ec6385b6793edffb1bf53b38c1fb093
DIR parent 6645bc3505551b987152c4d498838d0388e231be
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 13 Jul 2013 20:47:10 +0200
redefine do_send as a wrapper for send_tx
Diffstat:
M gui/gui_classic.py | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
---
DIR diff --git a/gui/gui_classic.py b/gui/gui_classic.py
t@@ -873,8 +873,7 @@ class ElectrumWindow(QMainWindow):
return lambda s, *args: s.do_protect(func, args)
- @protected
- def do_send(self, password):
+ def do_send(self):
label = unicode( self.message_e.text() )
r = unicode( self.payto_e.text() )
t@@ -899,6 +898,17 @@ class ElectrumWindow(QMainWindow):
QMessageBox.warning(self, _('Error'), _('Invalid Fee'), _('OK'))
return
+ confirm_amount = self.config.get('confirm_amount', 100000000)
+ if amount >= confirm_amount:
+ if not self.question("send %s to %s?"%(self.format_amount(amount) + ' '+ self.base_unit(), to_address)):
+ return
+
+ self.send_tx(to_address, amount, fee, label)
+
+
+ @protected
+ def send_tx(self, to_address, amount, fee, label, password):
+
try:
tx = self.wallet.mktx( [(to_address, amount)], password, fee, account=self.current_account)
except BaseException, e:
t@@ -909,11 +919,6 @@ class ElectrumWindow(QMainWindow):
QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK'))
return
- confirm_amount = self.config.get('confirm_amount', 100000000)
- if amount >= confirm_amount:
- if not self.question("send %s to %s?"%(self.format_amount(amount) + ' '+ self.base_unit(), to_address)):
- return
-
self.run_hook('send_tx', tx)
if label: