Torwards sane signalling for exchange_rate plugin

lib/network.py

@@ -17,7 +17,6 @@ from bitcoin import *
 from interface import Connection, Interface
 from blockchain import Blockchain
 from version import ELECTRUM_VERSION, PROTOCOL_VERSION
-from plugins import run_hook
 
 DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
 
@@ -137,7 +136,7 @@ class Network(util.DaemonThread):
           stop()
     """
 
-    def __init__(self, config=None):
+    def __init__(self, config=None, plugins=None):
         if config is None:
             config = {}  # Do not use mutables as default values!
         util.DaemonThread.__init__(self)
@@ -194,6 +193,9 @@ class Network(util.DaemonThread):
         self.socket_queue = Queue.Queue()
         self.start_network(deserialize_server(self.default_server)[2],
                            deserialize_proxy(self.config.get('proxy')))
+        self.plugins = plugins
+        if self.plugins:
+            self.plugins.set_network(self)
 
     def register_callback(self, event, callback):
         with self.lock:
@@ -752,7 +754,6 @@ class Network(util.DaemonThread):
             self.process_responses(interface)
 
     def run(self):
-        run_hook('set_network', self)
         self.blockchain.init()
         while self.is_running():
             self.maintain_sockets()
@@ -762,7 +763,8 @@ class Network(util.DaemonThread):
             self.process_pending_sends()
 
         self.stop_network()
-        run_hook('set_network', None)
+        if self.plugins:
+            self.plugins.set_network(None)
         self.print_error("stopped")
 
     def on_header(self, i, header):

lib/plugins.py

@@ -26,13 +26,6 @@ from util import *
 from i18n import _
 from util import print_error, profiler
 
-hook_names = set()
-hooks = {}
-
-def hook(func):
-    hook_names.add(func.func_name)
-    return func
-
 class Plugins:
 
     @profiler
@@ -126,11 +119,10 @@ class Plugins:
         x += (lambda: self.wallet_plugin_loader(config, name),)
         wallet.wallet_types.append(x)
 
-    @hook
     def set_network(self, network):
         if network != self.network:
-            jobs = [job in plugin.thread_jobs()
-                    for plugin in self.plugins.values()]
+            jobs = [job for plugin in self.plugins.values()
+                    for job in plugin.thread_jobs()]
             if self.network:
                 self.network.remove_jobs(jobs)
             self.network = network
@@ -149,6 +141,14 @@ class Plugins:
         self.windows.remove(window)
         self.trigger('on_close_window', window)
 
+
+hook_names = set()
+hooks = {}
+
+def hook(func):
+    hook_names.add(func.func_name)
+    return func
+
 def run_hook(name, *args):
     return _run_hook(name, False, *args)