Combine the Reload and Stop toolbar buttons into one

Add a combined action that toggles itself between the two states and
instantiate it from the window. Replace the Reload and Stop buttons
with the combined one in the default toolbar description.

https://bugzilla.gnome.org/show_bug.cgi?id=657655

1 files changed, 14 insertions, 0 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index 8b634292e..7fc4f3874 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -25,6 +25,7 @@
 
 #include "ephy-action-helper.h"
 #include "ephy-bookmarks-ui.h"
+#include "ephy-combined-stop-reload-action.h"
 #include "ephy-debug.h"
 #include "ephy-download-widget.h"
 #include "ephy-download.h"
@@ -1726,6 +1727,14 @@ setup_ui_manager (EphyWindow *window)
 	gtk_action_group_add_action_with_accel (action_group, action, "<control>N");
 	g_object_unref (action);
 
+	action = g_object_new (EPHY_TYPE_COMBINED_STOP_RELOAD_ACTION,
+			       "name", "ViewCombinedStopReload",
+			       "loading", FALSE,
+			       "window", window,
+			       NULL);
+	gtk_action_group_add_action (action_group, action);
+	g_object_unref (action);
+
 	gtk_ui_manager_insert_action_group (manager, action_group, 0);
 	window->priv->toolbar_action_group = action_group;
 	g_object_unref (action_group);
@@ -2089,6 +2098,11 @@ sync_tab_load_status (EphyWebView *view,
 	ephy_action_change_sensitivity_flags (action, SENS_FLAG_LOADING, loading);
 	action = gtk_action_group_get_action (action_group, "FilePrint");
 	ephy_action_change_sensitivity_flags (action, SENS_FLAG_LOADING, loading);
+
+	action = gtk_action_group_get_action (priv->toolbar_action_group,
+					      "ViewCombinedStopReload");
+	ephy_combined_stop_reload_action_set_loading (EPHY_COMBINED_STOP_RELOAD_ACTION (action),
+						      loading);
 }
 
 static void