From 276ad8043f050923f1acf8031af41b3a3ea73b56 Mon Sep 17 00:00:00 2001
From: Bobby Powers <bobby@laptop.org>
Date: Wed, 04 Mar 2009 08:10:36 +0000
Subject: bookmarks seem to be working again

---
diff --git a/browser.py b/browser.py
index c4fd4d7..17fe4bb 100644
--- a/browser.py
+++ b/browser.py
@@ -118,6 +118,7 @@ class Browser(WebView):
         return sessionstore.set_session(self, data)
 
     def get_source(self, async_cb, async_err_cb):
+        '''
         cls = components.classes[ \
                 '@mozilla.org/embedding/browser/nsWebBrowserPersist;1']
         persist = cls.createInstance(interfaces.nsIWebBrowserPersist)
@@ -133,6 +134,8 @@ class Browser(WebView):
 
         uri = self.web_navigation.currentURI            
         persist.saveURI(uri, self.doc_shell, None, None, None, local_file)
+        '''
+        logging.debug('browser.get_source not implemented')
 
 class PopupDialog(gtk.Window):
     def __init__(self):
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')
--
cgit v0.9.1