Added flavio patchHEADmaster

4 files changed, 15 insertions, 10 deletions

diff --git a/browser.py b/browser.py
index 7419d2d..a377add 100644
--- a/browser.py
+++ b/browser.py
@@ -192,7 +192,7 @@ class TabbedView(BrowserNotebook):
 
     def __new_tab_cb(self, browser, url):
         new_browser = self.add_tab(next_to_current=True)
-        new_browser.load_uri(url)
+        new_browser.open(url)
         new_browser.grab_focus()
 
     def __create_web_view_cb(self, web_view, frame):
@@ -341,11 +341,11 @@ class TabbedView(BrowserNotebook):
         browser = self.current_browser
 
         if os.path.isfile(_LIBRARY_PATH):
-            browser.load_uri('file://' + _LIBRARY_PATH)
+            browser.open(_LIBRARY_PATH)
         else:
             default_page = os.path.join(activity.get_bundle_path(),
                                         "data/index.html")
-            browser.load_uri('file://' + default_page)
+            browser.open(default_page)
         browser.grab_focus()
 
     def _get_current_browser(self):
diff --git a/palettes.py b/palettes.py
index a155dbe..4cd545e 100644
--- a/palettes.py
+++ b/palettes.py
@@ -224,7 +224,7 @@ class LinkPalette(Palette):
         if new_tab:
             new_browser = self._browser.open_new_tab(self._url)
         else:
-            self._browser.load_uri(self._url)
+            self._browser.open(self._url)
             self._browser.grab_focus()
 
     def __copy_activate_cb(self, menu_item):
diff --git a/webactivity.py b/webactivity.py
index 3c0d337..3211f2f 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -212,7 +212,7 @@ class WebActivity(activity.Activity):
         self.connect('key-press-event', self._key_press_cb)
 
         if handle.uri:
-            self._tabbed_view.current_browser.load_uri(handle.uri)
+            self._tabbed_view.current_browser.open(handle.uri)
         elif not self._jobject.file_path:
             # TODO: we need this hack until we extend the activity API for
             # opening URIs and default docs.
@@ -414,17 +414,20 @@ class WebActivity(activity.Activity):
                 tab_page.browser.grab_focus()
 
             self._tabbed_view.set_current_page(self.model.data['current_tab'])
+            
+            self._tabbed_view.props.current_browser.set_zoom_level(self.model.data['current_zoom_level'])
+            
         elif self.metadata['mime_type'] == 'text/uri-list':
             data = self._get_data_from_file_path(file_path)
             uris = mime.split_uri_list(data)
             if len(uris) == 1:
-                self._tabbed_view.props.current_browser.load_uri(uris[0])
+                self._tabbed_view.props.current_browser.open(uris[0])
             else:
                 _logger.error('Open uri-list: Does not support'
                               'list of multiple uris by now.')
         else:
-            file_uri = 'file://' + file_path
-            self._tabbed_view.props.current_browser.load_uri(file_uri)
+            file_uri = file_path
+            self._tabbed_view.props.current_browser.open(file_uri)
             self._tabbed_view.props.current_browser.grab_focus()
 
     def write_file(self, file_path):
@@ -434,6 +437,8 @@ class WebActivity(activity.Activity):
         if self.metadata['mime_type'] == 'text/plain':
 
             browser = self._tabbed_view.current_browser
+            
+            self.model.data['current_zoom_level'] = browser.get_zoom_level()
 
             if not self._jobject.metadata['title_set_by_user'] == '1':
                 if browser.props.title is None:
@@ -588,7 +593,7 @@ class WebActivity(activity.Activity):
 
     def _link_clicked_cb(self, button, url):
         ''' an item of the link tray has been clicked '''
-        self._tabbed_view.props.current_browser.load_uri(url)
+        self._tabbed_view.props.current_browser.open(url)
 
     def _get_screenshot(self):
         browser = self._tabbed_view.props.current_browser
diff --git a/webtoolbar.py b/webtoolbar.py
index dc0b3de..9ebd93e 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -458,7 +458,7 @@ class PrimaryToolbar(ToolbarBase):
     def _entry_activate_cb(self, entry):
         url = entry.props.text
         effective_url = self._tabbed_view.normalize_or_autosearch_url(url)
-        self._browser.load_uri(effective_url)
+        self._browser.open(effective_url)
         self._browser.loading_uri = effective_url
         self.entry.props.address = effective_url
         self._browser.grab_focus()