Various cleanups.

3 files changed, 26 insertions, 53 deletions

diff --git a/browser.py b/browser.py
index 98e5b65..3a44599 100644
--- a/browser.py
+++ b/browser.py
@@ -189,7 +189,7 @@ class Browser(webkit.WebView):
     def __init__(self, activity_p):
         webkit.WebView.__init__(self)
 
-        self._activity_p = activity_p
+        self._activity = activity_p
         
         self._loaded = False # needed until webkitgtk 1.1.7+
         
@@ -211,7 +211,7 @@ class Browser(webkit.WebView):
         super(Browser, self).load_uri(uri)
 
     def __download_requested_cb(self, browser, download):
-        downloadmanager.process_download(download, self._activity_p)
+        downloadmanager.process_download(download, self._activity)
         return True
 
     def __mime_type_policy_cb(self, webview, frame, request, mimetype,
@@ -269,10 +269,7 @@ class Browser(webkit.WebView):
     def set_session(self, data):
         history = self.get_back_forward_list()
 
-        # webkitgtk+ v1.3.1+
-        #history.clear()
-
-        # temporary workaround to clear history
+        # HACK: workaround to clear history until webkitgtk 1.1.7+
         limit = history.get_limit()
         history.set_limit(0)
         history.set_limit(limit)
@@ -280,30 +277,11 @@ class Browser(webkit.WebView):
         for entry_dict in data:
             logging.debug('entry_dict: %r' % entry_dict)
 
-            entry = webkit.WebHistoryItem(entry_dict['url'], entry_dict['title'])
+            entry = webkit.WebHistoryItem(entry_dict['url'],
+                                          entry_dict['title'])
             history.add_item(entry)
 
         if data:
             self.go_to_back_forward_item(history.get_current_item())
         else:
             self.load_uri('about:blank')
-
-class PopupDialog(gtk.Window):
-    def __init__(self):
-        gtk.Window.__init__(self)
-
-        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
-
-        border = style.GRID_CELL_SIZE
-        self.set_default_size(gtk.gdk.screen_width() - border * 2,
-                              gtk.gdk.screen_height() - border * 2)
-
-        self.view = webkit.WebView()
-        self.view.connect('notify::visibility', self.__notify_visibility_cb)
-        self.add(self.view)
-        self.view.realize()
-
-    def __notify_visibility_cb(self, web_view, pspec):
-        if self.view.props.visibility:
-            self.view.show()
-            self.show()
diff --git a/places.py b/places.py
index 18f9c83..c69b841 100644
--- a/places.py
+++ b/places.py
@@ -31,6 +31,15 @@ class Place(object):
         self.visits = 0
         self.last_visit = datetime.now()
 
+    @staticmethod
+    def from_row(row):
+        place = Place()
+
+        place.uri, place.title, place.bookmark, \
+            place.visits, place.last_visit = row
+
+        return place
+
 
 class SqliteStore(object):
     MAX_SEARCH_MATCHES = 20
@@ -95,7 +104,7 @@ class SqliteStore(object):
 
             row = cursor.fetchone()
             if row:
-                return self._place_from_row(row)
+                return Place.from_row(row)
             else:
                 return None
         finally:
@@ -113,14 +122,6 @@ class SqliteStore(object):
         finally:
             cursor.close()
 
-    def _place_from_row(self, row):
-        place = Place()
-
-        place.uri, place.title, place.bookmark, \
-            place.visits, place.last_visit = row
-
-        return place
-
     def _cleanup(self):
         cursor = self._connection.cursor()
 
diff --git a/webtoolbar.py b/webtoolbar.py
index fb3a0a2..57058fc 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -404,27 +404,21 @@ class PrimaryToolbar(ToolbarBox):
         back_palette = self._back.get_palette()
         forward_palette = self._forward.get_palette()
 
-        # clear the palettes
         for palette in (back_palette, forward_palette):
             for menu_item in palette.menu.get_children():
                 palette.menu.remove(menu_item)
 
-        # (re)populate the palettes
-        for item in list(history.get_back_list_with_limit(limit)):
-            menu_item = MenuItem(item.get_title(), text_maxlen=60)
-            menu_item.connect('activate', self.__history_item_activated_cb,
-                              item)
-
-            back_palette.menu.append(menu_item)
-            menu_item.show()
-
-        for item in list(history.get_forward_list_with_limit(limit)):
-            menu_item = MenuItem(item.get_title(), text_maxlen=60)
-            menu_item.connect('activate', self.__history_item_activated_cb,
-                              item)
-
-            forward_palette.menu.append(menu_item)
-            menu_item.show()
+        def populate(history_list, palette):
+            for history_item in history_list:
+                menu_item = MenuItem(item.get_title(), text_maxlen=60)
+                menu_item.connect('activate', self.__history_item_activated_cb,
+                                  history_item)
+    
+                palette.menu.append(menu_item)
+                menu_item.show()
+
+        populate(history.get_back_list_with_limit(limit), back_palette)        
+        populate(history.get_forward_list_with_limit(limit), forward_palette)        
 
     def __history_item_activated_cb(self, menu_item, history_item):
         browser = self._tabbed_view.props.current_browser