diff options
author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-15 10:44:49 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-15 10:44:49 (GMT) |
commit | 7d3a1a97044b902d83e901c30fdc5a5d4a1f6d55 (patch) | |
tree | 6f52f8f717a3b555c6f6fb4772567ae317b21059 /webtoolbar.py | |
parent | 20ad7335187c584434e6ccff2903188462543c1c (diff) |
Adapt to hulahop API changes and start to clean up the singletons mess.
Diffstat (limited to 'webtoolbar.py')
-rw-r--r-- | webtoolbar.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/webtoolbar.py b/webtoolbar.py index 03fc2f5..428fd89 100644 --- a/webtoolbar.py +++ b/webtoolbar.py @@ -27,8 +27,6 @@ from sugar.graphics.toolbutton import ToolButton from sugar.graphics.menuitem import MenuItem from sugar._sugarext import AddressEntry -import sessionhistory -import progresslistener import filepicker import places @@ -265,7 +263,7 @@ class WebToolbar(gtk.Toolbar): self.insert(self._link_add, -1) self._link_add.show() - progress_listener = progresslistener.get_instance() + progress_listener = browser.progress progress_listener.connect('location-changed', self._location_changed_cb) progress_listener.connect('loading-start', self._loading_start_cb) @@ -273,9 +271,8 @@ class WebToolbar(gtk.Toolbar): progress_listener.connect('loading-progress', self._loading_progress_cb) - session_history = sessionhistory.get_instance() - session_history.connect('session-history-changed', - self._session_history_changed_cb) + self._browser.history.connect('session-history-changed', + self._session_history_changed_cb) self._browser.connect("notify::title", self._title_changed_cb) |