diff options
Diffstat (limited to 'webactivity.py')
-rw-r--r-- | webactivity.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/webactivity.py b/webactivity.py index 01c8c80..58eebe0 100644 --- a/webactivity.py +++ b/webactivity.py @@ -203,11 +203,10 @@ class WebActivity(activity.Activity): self.set_canvas(scrolled_window) self._browser.show() - self._browser.history.connect('session-link-changed', - self._session_history_changed_cb) + self._browser.connect('load-finished', self._page_changed_cb) self._web_toolbar.connect('add-link', self._link_add_button_cb) - self._browser.connect("notify::title", self._title_changed_cb) + self._browser.connect("title-changed", self._title_changed_cb) self.model = Model() self.model.connect('add_link', self._add_link_model_cb) @@ -355,14 +354,17 @@ class WebActivity(activity.Activity): else: self._browser.load_uri('about:blank') - def _session_history_changed_cb(self, session_history, link): - _logger.debug('NewPage: %s.' %link) - self.current = link + def _page_changed_cb(self, view, frame): + ui_title = frame.get_title() + ui_uri = frame.get_uri() + _logger.debug('NewPage: "%s" (%s).' % (ui_title, ui_uri)) + # i think this is just the uri? + self.current = ui_uri - def _title_changed_cb(self, embed, pspec): - if embed.props.title is not '': - _logger.debug('Title changed=%s' % embed.props.title) - self.webtitle = embed.props.title + def _title_changed_cb(self, view, frame, new_title): + if new_title and new_title != '': + _logger.debug('Title changed=%s' % new_title) + self.webtitle = new_title def _get_data_from_file_path(self, file_path): fd = open(file_path, 'r') |