*** empty log message ***

3 files changed, 16 insertions, 0 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index ec023ff83..30b51ce6f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -417,8 +417,15 @@ add_widget (EggMenuMerge *merge, GtkWidget *widget, EphyWindow *window)
 	}
 	else
 	{
+		GtkWidget *event_box;
+
 		window->priv->toolbars = g_list_append
 			(window->priv->toolbars, widget);
+
+		event_box = gtk_event_box_new ();
+		gtk_widget_show (event_box);
+		gtk_container_add (GTK_CONTAINER (event_box), widget);
+		widget = event_box;
 	}
 
 	gtk_box_pack_start (GTK_BOX (window->priv->menu_dock),
diff --git a/src/toolbar.c b/src/toolbar.c
index 7edc38490..ff5f9cba1 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -208,12 +208,14 @@ toolbar_setup_actions (Toolbar *t)
 
 	action = g_object_new (EPHY_TYPE_SPINNER_ACTION,
 			       "name", "Spinner",
+			       "label", "Spinner",
 			       NULL);
 	egg_action_group_add_action (t->priv->action_group, action);
 	g_object_unref (action);
 
 	action = g_object_new (EPHY_TYPE_LOCATION_ACTION,
 			       "name", "Location",
+			       "label", "Location",
 			       NULL);
 	g_signal_connect (action, "go_location",
 			  G_CALLBACK (go_location_cb), t->priv->window);
@@ -222,6 +224,7 @@ toolbar_setup_actions (Toolbar *t)
 
 	action = g_object_new (EPHY_TYPE_FAVICON_ACTION,
 			       "name", "Favicon",
+			       "label", "Favicon",
 			       "window", t->priv->window,
 			       NULL);
 	egg_action_group_add_action (t->priv->action_group, action);
diff --git a/src/window-commands.c b/src/window-commands.c
index a8957a0ed..66a3539bb 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -29,6 +29,7 @@
 #include "ephy-bookmarks-editor.h"
 #include "ephy-new-bookmark.h"
 #include "egg-toggle-action.h"
+#include "ephy-editable-toolbar.h"
 
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
@@ -639,6 +640,11 @@ void
 window_cmd_edit_toolbar (EggAction *action,
 			 EphyWindow *window)
 {
+	Toolbar *toolbar;
+
+	toolbar = ephy_window_get_toolbar (window);
+
+	ephy_editable_toolbar_edit (EPHY_EDITABLE_TOOLBAR (toolbar));
 }
 
 void