diff options
-rw-r--r-- | webactivity.py | 5 | ||||
-rw-r--r-- | webactivity.py.orig | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/webactivity.py b/webactivity.py index 86d38f5..12c5280 100644 --- a/webactivity.py +++ b/webactivity.py @@ -161,6 +161,11 @@ class WebActivity(activity.Activity): session.set_property('ssl-use-system-ca-file', True) session.set_property('ssl-strict', False) + # Honor the http_proxy variable + if os.environ.get('http_proxy') is not None: + proxy_uri = Soup.URI.new(os.environ['http_proxy']) + session.set_property("proxy-uri",proxy_uri) + # By default, cookies are not stored persistently, we have to # add a cookie jar so that they get saved to disk. We use one # with a SQlite database: diff --git a/webactivity.py.orig b/webactivity.py.orig index fdc12dd..86d38f5 100644 --- a/webactivity.py.orig +++ b/webactivity.py.orig @@ -133,6 +133,7 @@ from browser import ZOOM_ORIGINAL from webtoolbar import PrimaryToolbar from edittoolbar import EditToolbar from viewtoolbar import ViewToolbar +from hometoolbar import HomeToolbar import downloadmanager # TODO: make the registration clearer SL #3087 @@ -183,11 +184,10 @@ class WebActivity(activity.Activity): self._primary_toolbar = PrimaryToolbar(self._tabbed_view, self) self._edit_toolbar = EditToolbar(self) self._view_toolbar = ViewToolbar(self) + self._home_toolbar = HomeToolbar(self) self._primary_toolbar.connect('add-link', self._link_add_button_cb) - self._primary_toolbar.connect('go-home', self._go_home_button_cb) - self._edit_toolbar_button = ToolbarButton( page=self._edit_toolbar, icon_name='toolbar-edit') @@ -201,6 +201,12 @@ class WebActivity(activity.Activity): self._primary_toolbar.toolbar.insert( view_toolbar_button, 2) + home_toolbar_button = ToolbarButton( + page=self._home_toolbar, + icon_name='go-home') + self._primary_toolbar.toolbar.insert( + home_toolbar_button, 3) + self._primary_toolbar.show_all() self.set_toolbar_box(self._primary_toolbar) @@ -487,6 +493,9 @@ class WebActivity(activity.Activity): def _go_home_button_cb(self, button): self._tabbed_view.load_homepage() + def _change_home_button_cb(self, button): + self._tabbed_view.change_homepage() + def _key_press_cb(self, widget, event): key_name = Gdk.keyval_name(event.keyval) browser = self._tabbed_view.props.current_browser |