[epiphany] Remove toolbar editor

[Xan Lopez <xan src gnome org>]

commit aec912b5fc328171d989963421a6ceed0d8c6f03
Author: Xan Lopez <xlopez igalia com>
Date:   Thu Nov 17 16:57:42 2011 +0100

    Remove toolbar editor
    
    The UI is gone, but the infrastructure still persists
    (EggToolbarModel, etc). Further cleanups are possible.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=664260

 data/ui/epiphany-ui.xml   |    4 -
 lib/ephy-prefs.h          |    1 -
 src/Makefile.am           |    2 -
 src/ephy-lockdown.c       |   13 --
 src/ephy-toolbar-editor.c |  371 ---------------------------------------------
 src/ephy-toolbar-editor.h |   63 --------
 src/ephy-window.c         |   17 --
 src/window-commands.c     |    8 -
 8 files changed, 0 insertions(+), 479 deletions(-)
---
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 2091def..ad8577c 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -44,8 +44,6 @@
 					</placeholder>
 					<separator/>
 					<menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
-					<menuitem name="ViewToolbarEditorMenu" action="ViewToolbarEditor"/>
-					<separator/>
 				</menu>
 			</placeholder>
 			<menuitem name="ViewMenuBar" action="ViewMenuBar"/>
@@ -202,8 +200,6 @@
 		<placeholder name="ViewToolbarsGroup">
 		</placeholder>
 		<separator/>
-		<menuitem action="ViewToolbarEditor"/>
-		<separator/>
 		<menuitem action="ViewMenuBar" />
 		<menuitem name="ViewDownloadsBar" action="ViewDownloadsBar"/>
 	</popup>
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 1a5910e..c5a954c 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -110,7 +110,6 @@ typedef enum
 #define EPHY_PREFS_LOCKDOWN_FULLSCREEN		"disable-fullscreen"
 #define EPHY_PREFS_LOCKDOWN_ARBITRARY_URL	"disable-arbitrary-url"
 #define EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING	"disable-bookmark-editing"
-#define EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING	"disable-toolbar-editing"
 #define EPHY_PREFS_LOCKDOWN_HISTORY		"disable-history"
 #define EPHY_PREFS_LOCKDOWN_SAVE_TO_DISK	"disable-save-to-disk"
 #define EPHY_PREFS_LOCKDOWN_PRINTING		"disable-printing"
diff --git a/src/Makefile.am b/src/Makefile.am
index f491450..49463d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,6 @@ NOINST_H_FILES = \
 	ephy-tabs-menu.h			\
 	ephy-toolbars-model.h			\
 	ephy-toolbar.h				\
-	ephy-toolbar-editor.h			\
 	languages.h				\
 	pdm-dialog.h				\
 	popup-commands.h			\
@@ -77,7 +76,6 @@ libephymain_la_SOURCES = \
 	ephy-tabs-menu.c			\
 	ephy-toolbars-model.c			\
 	ephy-toolbar.c				\
-	ephy-toolbar-editor.c			\
 	ephy-window.c				\
 	pdm-dialog.c				\
 	popup-commands.c			\
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 61aec8d..54eb58a 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -111,8 +111,6 @@ static const BindAction window_actions[] = {
 	{ EPHY_PREFS_LOCKDOWN_PRINT_SETUP, "FilePrintSetup", "sensitive" },
 	{ EPHY_PREFS_LOCKDOWN_COMMAND_LINE, "FilePrintSetup", "sensitive" },
 
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "ViewToolbarEditor", "sensitive" },
-
 	{ EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING, "GoBookmarks", "sensitive" },
 	{ EPHY_PREFS_LOCKDOWN_BOOKMARK_EDITING, "FileBookmarkPage", "sensitive" },
 
@@ -144,12 +142,6 @@ static const BindAction special_toolbar_actions[] = {
 	{ EPHY_PREFS_LOCKDOWN_FULLSCREEN, "FileNewWindow", "sensitive" }
 };
 
-static const BindAction toolbar_actions[] = {
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "MoveToolItem", "sensitive" },
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "RemoveToolItem", "sensitive" },
-	{ EPHY_PREFS_LOCKDOWN_TOOLBAR_EDITING, "RemoveToolbar", "sensitive" }
-};
-
 static gboolean
 sensitive_get_mapping (GValue *value,
 		       GVariant *variant,
@@ -259,11 +251,6 @@ impl_attach_window (EphyExtension *extension,
 	bind_settings_and_actions (EPHY_SETTINGS_LOCKDOWN,
 				   action_group, special_toolbar_actions,
 				   G_N_ELEMENTS (special_toolbar_actions));
-
-	action_group = find_action_group (manager, "ToolbarActions");
-	bind_settings_and_actions (EPHY_SETTINGS_LOCKDOWN,
-				   action_group, toolbar_actions,
-				   G_N_ELEMENTS (toolbar_actions));
 }
 
 static void
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 1518624..3dcf58f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -189,9 +189,6 @@ static const GtkActionEntry ephy_menu_entries [] = {
 
 	/* View menu */
 
-	{ "ViewToolbarEditor", NULL, N_("_Customize Toolbarsâ"), NULL,
-	  N_("Customize toolbars"),
-	  G_CALLBACK (window_cmd_edit_toolbar) },
 	{ "ViewStop", GTK_STOCK_STOP, N_("_Stop"), "Escape",
 	  N_("Stop current data transfer"),
 	  G_CALLBACK (window_cmd_view_stop) },
@@ -810,7 +807,6 @@ sync_chromes_visibility (EphyWindow *window)
 {
 	EphyWindowPrivate *priv = window->priv;
 	GtkWidget *menubar;
-	GtkAction *action;
 	gboolean show_menubar, show_toolbar, show_tabsbar;
 
 	if (priv->closing) return;
@@ -826,19 +822,6 @@ sync_chromes_visibility (EphyWindow *window)
 	g_object_set (priv->toolbar, "visible", show_toolbar, NULL);
 
 	ephy_notebook_set_show_tabs (EPHY_NOTEBOOK (priv->notebook), show_tabsbar);
-
-	action = gtk_action_group_get_action (priv->action_group, "ViewToolbarEditor");
-
-	if (priv->fullscreen_popup != NULL)
-	{
-		g_object_set (priv->fullscreen_popup, "visible", !show_toolbar, NULL);
-
-		ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, TRUE);
-	}
-	else
-	{
-		ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, !show_toolbar);
-	}
 }
 
 static void
diff --git a/src/window-commands.c b/src/window-commands.c
index 04a115e..e066997 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -43,7 +43,6 @@
 #include "ephy-gui.h"
 #include "ephy-zoom.h"
 #include "ephy-notebook.h"
-#include "ephy-toolbar-editor.h"
 #include "ephy-find-toolbar.h"
 #include "ephy-location-entry.h"
 #include "ephy-bookmarks-ui.h"
@@ -1223,13 +1222,6 @@ window_cmd_edit_prefs (GtkAction *action,
 }
 
 void
-window_cmd_edit_toolbar (GtkAction *action,
-			 EphyWindow *window)
-{
-	ephy_toolbar_editor_show (window);
-}
-
-void
 window_cmd_help_contents (GtkAction *action,
 			 EphyWindow *window)
 {