From df692b9355410e6f7f3adc853f353895833edd94 Mon Sep 17 00:00:00 2001
From: Martin Langhoff <martin@laptop.org>
Date: Wed, 02 Feb 2011 17:10:50 +0000
Subject: Add support for tabbed Browse (>108)

Untested as other aspects of integration are broken.

Includes fixups by Gonzalo Odiard <gonzalo@laptop.org>
---
diff --git a/activity.py b/activity.py
index 924ff86..651df3a 100644
--- a/activity.py
+++ b/activity.py
@@ -69,6 +69,14 @@ class WikipediaActivity(webactivity.WebActivity):
         self.toolbox.add_toolbar('Buscar', self.searchtoolbar)
         self.searchtoolbar.show()
 
+    def _get_browser(self):
+        if hasattr(self, '_browser') and callable(self._browser):
+            # Browse < 109
+            return self._browser
+        else:
+            return self._tabbed_view.props.current_browser
+
     def _load_homepage(self):
         home_url = 'http://localhost:%s%s' % (self.HTTP_PORT, HOME_PAGE)
-        self._browser.load_uri(home_url)
+        browser = self._get_browser()
+        browser.load_uri(home_uri)
diff --git a/searchtoolbar.py b/searchtoolbar.py
index 16c9c99..9f5a6b6 100644
--- a/searchtoolbar.py
+++ b/searchtoolbar.py
@@ -29,8 +29,6 @@ class SearchToolbar(gtk.Toolbar):
 
         self._activity = activity        
 
-        self._browser = self._activity._browser
-
         self._providercombo = ToolComboBox()
 
         self.insert(self._providercombo, -1)
@@ -62,8 +60,9 @@ class SearchToolbar(gtk.Toolbar):
         k = self._providercombo.combo.get_active_item()[0]
         p = self._providers[k]
         
-        self._browser.load_uri(p['url'] % entry.props.text)
-        self._browser.grab_focus()
+        browser = self._activity._get_browser()
+        browser.load_uri(p['url'] % entry.props.text)
+        browser.grab_focus()
         
         self._activity.toolbox.current_toolbar = 1
 
--
cgit v0.9.1