diff options
Diffstat (limited to 'webtoolbar.py')
| -rw-r--r-- | webtoolbar.py | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/webtoolbar.py b/webtoolbar.py index 72cf8ab..df97bdf 100644 --- a/webtoolbar.py +++ b/webtoolbar.py @@ -260,42 +260,34 @@ class WebToolbar(gtk.Toolbar): self.insert(self._link_add, -1) self._link_add.show() - progress_listener = browser.progress - progress_listener.connect('location-changed', - self._location_changed_cb) - progress_listener.connect('loading-start', self._loading_start_cb) - progress_listener.connect('loading-stop', self._loading_stop_cb) - progress_listener.connect('loading-progress', - self._loading_progress_cb) + browser.connect('load-finished', self._loading_stop_cb) + browser.connect('load-started', self._loading_start_cb) + browser.connect('load-progress-changed', self._loading_progress_cb) - self._browser.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) + self._browser.connect("title-changed", self._title_changed_cb) def _session_history_changed_cb(self, session_history, current_page_index): # We have to wait until the history info is updated. gobject.idle_add(self._reload_session_history, current_page_index) - def _location_changed_cb(self, progress_listener, uri): - #cls = components.classes['@mozilla.org/intl/texttosuburi;1'] - #texttosuburi = cls.getService(interfaces.nsITextToSubURI) - ui_uri = ''#texttosuburi.unEscapeURIForUI(uri.originCharset, uri.spec) - - self._set_address(ui_uri) - self._update_navigation_buttons() - filepicker.cleanup_temp_files() - def _loading_start_cb(self, progress_listener): self._set_title(None) self._set_loading(True) self._update_navigation_buttons() - def _loading_stop_cb(self, progress_listener): + def _loading_stop_cb(self, view, frame): self._set_loading(False) + ui_title = frame.get_title() + ui_uri = frame.get_uri() + self._set_address(ui_uri) + self._set_title(ui_title) self._update_navigation_buttons() + filepicker.cleanup_temp_files() - def _loading_progress_cb(self, progress_listener, progress): + def _loading_progress_cb(self, view, progress): self._set_progress(progress) def _set_progress(self, progress): @@ -314,10 +306,10 @@ class WebToolbar(gtk.Toolbar): self._stop_and_reload.set_icon('view-refresh') def _update_navigation_buttons(self): - can_go_back = self._browser.web_navigation.canGoBack + can_go_back = self._browser.can_go_back() self._back.props.sensitive = can_go_back - can_go_forward = self._browser.web_navigation.canGoForward + can_go_forward = self._browser.can_go_forward() self._forward.props.sensitive = can_go_forward def _entry_activate_cb(self, entry): @@ -325,13 +317,13 @@ class WebToolbar(gtk.Toolbar): self._browser.grab_focus() def _go_back_cb(self, button): - self._browser.web_navigation.goBack() + self._browser.go_back() def _go_forward_cb(self, button): - self._browser.web_navigation.goForward() + self._browser.go_forward() - def _title_changed_cb(self, embed, spec): - self._set_title(embed.props.title) + def _title_changed_cb(self, view, new_title): + self._set_title(new_title) def _stop_and_reload_cb(self, button): if self._loading: |