From d8c30900e0ac41fac0cd72975b593502c6f6b752 Mon Sep 17 00:00:00 2001
From: Lucian Branescu Mihaila <lucian.branescu@gmail.com>
Date: Mon, 25 Oct 2010 08:37:37 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline into sucrose-0.90

---
diff --git a/webactivity.py b/webactivity.py
index eadfaa8..d744ab1 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -212,6 +212,8 @@ class WebActivity(activity.Activity):
 
         self._primary_toolbar.connect('add-tab', self._new_tab_cb)
 
+        self._primary_toolbar.connect('go-home', self._go_home_button_cb)
+
         self._tray = HTray()
         self.set_tray(self._tray, gtk.POS_BOTTOM)
         self._tray.show()
@@ -469,6 +471,9 @@ class WebActivity(activity.Activity):
     def _link_add_button_cb(self, button):
         self._add_link()
 
+    def _go_home_button_cb(self, button):
+        self._load_homepage()
+
     def _key_press_cb(self, widget, event):
         key_name = gtk.gdk.keyval_name(event.keyval)
         browser = self._tabbed_view.props.current_browser
diff --git a/webtoolbar.py b/webtoolbar.py
index 290011e..a5e2c6e 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -225,6 +225,9 @@ class PrimaryToolbar(ToolbarBox):
                      ([])),
         'add-tab': (gobject.SIGNAL_RUN_FIRST,
                      gobject.TYPE_NONE,
+                     ([])),
+        'go-home': (gobject.SIGNAL_RUN_FIRST,
+                     gobject.TYPE_NONE,
                      ([]))
     }
 
@@ -240,6 +243,12 @@ class PrimaryToolbar(ToolbarBox):
         activity_button = ActivityToolbarButton(self._activity)
         self.toolbar.insert(activity_button, 0)
 
+        self._go_home = ToolButton('go-home')
+        self._go_home.set_tooltip(_('Home page'))
+        self._go_home.connect('clicked', self._go_home_cb)
+        self.toolbar.insert(self._go_home, -1)
+        self._go_home.show()
+
         self._stop_and_reload = ToolButton('media-playback-stop')
         self._stop_and_reload.connect('clicked', self._stop_and_reload_cb)
         self.toolbar.insert(self._stop_and_reload, -1)
@@ -397,6 +406,10 @@ class PrimaryToolbar(ToolbarBox):
     def _add_tab_cb(self, button):
         self.emit('add-tab')
 
+    def _go_home_cb(self, button):
+        self.emit('go-home')
+        self._activity.load_homepage()
+
     def _go_back_cb(self, button):
         browser = self._tabbed_view.props.current_browser
         browser.web_navigation.goBack()
--
cgit v0.9.1