From 7d3a1a97044b902d83e901c30fdc5a5d4a1f6d55 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Wed, 15 Oct 2008 10:44:49 +0000
Subject: Adapt to hulahop API changes and start to clean up the singletons mess.

---
(limited to 'sessionhistory.py')

diff --git a/sessionhistory.py b/sessionhistory.py
index 3f781bf..b50bb45 100644
--- a/sessionhistory.py
+++ b/sessionhistory.py
@@ -31,14 +31,15 @@ class HistoryListener(gobject.GObject):
                                     ([str]))
     }
 
-    def __init__(self, browser):
+    def __init__(self):
         gobject.GObject.__init__(self)
 
         self._wrapped_self = xpcom.server.WrapObject( \
                 self, interfaces.nsISHistoryListener)
         weak_ref = xpcom.client.WeakReference(self._wrapped_self)
 
-        self._session_history = browser.web_navigation.sessionHistory
+    def setup(self, web_navigation):
+        self._session_history = web_navigation.sessionHistory
         self._session_history.addSHistoryListener(self._wrapped_self)
 
     def OnHistoryGoBack(self, back_uri):
@@ -73,13 +74,3 @@ class HistoryListener(gobject.GObject):
         self.emit('session-link-changed', reload_uri.spec)
         logging.debug("OnHistoryReload: %s" % reload_uri.spec)
         return True
-
-_session_history_listener = None
-
-def init(browser):
-    global _session_history_listener
-    _session_history_listener = HistoryListener(browser)
-
-def get_instance():
-    global _session_history_listener
-    return _session_history_listener
--
cgit v0.9.1