electrum

commit 89f9f4144542b5b905e57bce83dfd9a351db2019
parent e9f3b2151903932fa52d67d98e937ab1e34bca32
Author: ThomasV <electrumdev@gmail.com>
Date:   Mon,  6 Jul 2015 18:26:13 +0200

Merge pull request #1348 from LedgerHQ/btchip-fix-signal-name

Rename signals to avoid name clashes
Diffstat:
M
plugins/btchipwallet.py
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/btchipwallet.py b/plugins/btchipwallet.py
@@ -511,8 +511,8 @@ class BTChipQTHandler:
     def __init__(self, win):
         self.win = win
         self.win.connect(win, SIGNAL('btchip_done'), self.dialog_stop)
-        self.win.connect(win, SIGNAL('message_dialog'), self.message_dialog)
-        self.win.connect(win, SIGNAL('auth_dialog'), self.auth_dialog)
+        self.win.connect(win, SIGNAL('btchip_message_dialog'), self.message_dialog)
+        self.win.connect(win, SIGNAL('btchip_auth_dialog'), self.auth_dialog)
         self.done = threading.Event()
 
     def stop(self):
@@ -520,12 +520,12 @@ class BTChipQTHandler:
 
     def show_message(self, msg):
         self.message = msg
-        self.win.emit(SIGNAL('message_dialog'))
+        self.win.emit(SIGNAL('btchip_message_dialog'))
 
     def prompt_auth(self, msg):
         self.done.clear()
         self.message = msg
-        self.win.emit(SIGNAL('auth_dialog'))
+        self.win.emit(SIGNAL('btchip_auth_dialog'))
         self.done.wait()
         return self.response