AaronFiore/electrum
1
0
Fork 0
Code Activity

fix payment ack

Browse Source
This commit is contained in:
ThomasV
2014-05-07 18:59:51 +02:00
parent a03b85a513
commit 370bdbe855
3 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gui/qt/__init__.py
View File

@@ -71,6 +71,7 @@ class ElectrumGui:
self.app = QApplication(sys.argv)
self.app.installEventFilter(self.efilter)
init_plugins(self)
self.payment_request = None
def build_tray_menu(self):

8
gui/qt/main_window.py
View File

@@ -121,7 +121,6 @@ class ElectrumWindow(QMainWindow):
set_language(config.get('language'))
self.funds_error = False
self.payment_request = None
self.completions = QStringListModel()
self.tabs = tabs = QTabWidget(self)
@@ -874,10 +873,11 @@ class ElectrumWindow(QMainWindow):
return
def broadcast_thread():
if self.payment_request:
if self.gui_object.payment_request:
print "sending ack"
refund_address = self.wallet.addresses()[0]
self.payment_request.send_ack(str(tx), refund_address)
self.payment_request = None
self.gui_object.payment_request.send_ack(str(tx), refund_address)
self.gui_object.payment_request = None
# note: BIP 70 recommends not broadcasting the tx to the network and letting the merchant do that
self.tx_broadcast_result = self.wallet.sendtx(tx)
self.emit(SIGNAL('send_tx3'))