electrum

commit 5ffd26402e274ded65a8c81d2e13fd594844eb20
parent 16344b43af5b43eacda22af1272f27588dd281ec
Author: ThomasV <thomasv@gitorious>
Date:   Thu, 11 Jun 2015 09:36:19 +0200

separate load_wallet hook for installwizard

Diffstat:
M
gui/qt/installwizard.py
 | 
2
+-
M
plugins/trezor.py
 | 
4
++++
M
plugins/trustedcoin.py
 | 
5
+++++

3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -347,7 +347,7 @@ class InstallWizard(QDialog):
             password = None
 
         # load wallet in plugins
-        run_hook('load_wallet', wallet, self)
+        always_hook('installwizard_load_wallet', wallet, self)
 
         while action is not None:
             util.print_error("installwizard:", wallet, action)
diff --git a/plugins/trezor.py b/plugins/trezor.py
@@ -118,6 +118,10 @@ class Plugin(BasePlugin):
             self.wallet.force_watching_only = True
 
     @hook
+    def installwizard_load_wallet(self, wallet, window):
+        self.load_wallet(wallet, window)
+
+    @hook
     def installwizard_restore(self, wizard, storage):
         if storage.get('wallet_type') != 'trezor': 
             return
diff --git a/plugins/trustedcoin.py b/plugins/trustedcoin.py
@@ -334,6 +334,11 @@ class Plugin(BasePlugin):
         t.start()
 
     @hook
+    def installwizard_load_wallet(self, wallet, window):
+        self.wallet = wallet
+        self.window = window
+
+    @hook
     def close_wallet(self):
         self.window.statusBar().removeWidget(self.trustedcoin_button)