merge in changes from master

1 files changed, 13 insertions, 6 deletions

diff --git a/examples/data/uzbl/plugins/on_event.py b/examples/data/uzbl/plugins/on_event.py
index f1ad0c9..b9c504a 100644
--- a/examples/data/uzbl/plugins/on_event.py
+++ b/examples/data/uzbl/plugins/on_event.py
@@ -92,9 +92,16 @@ def parse_on_event(uzbl, args):
 
 
 def init(uzbl):
-
-    connects = {'ON_EVENT': parse_on_event,
-      'INSTANCE_START': add_instance,
-      'INSTANCE_EXIT': del_instance}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'INSTANCE_EXIT':    del_instance,
+        'INSTANCE_START':   add_instance,
+        'ON_EVENT':         parse_on_event,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'get_on_events':    get_on_events,
+        'on_event':         on_event,
+    })