diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-lockdown.c | 2 | ||||
| -rwxr-xr-x | src/ephy-toolbar.c | 1 | ||||
| -rw-r--r-- | src/ephy-window.c | 9 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c index 723042320..1141d0b83 100644 --- a/src/ephy-lockdown.c +++ b/src/ephy-lockdown.c @@ -193,7 +193,7 @@ update_window (EphyWindow *window, ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled || !writable); disabled = eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_TOOLBAR_EDITING); - action = gtk_action_group_get_action (action_group, "EditToolbar"); + action = gtk_action_group_get_action (action_group, "ViewToolbarEditor"); ephy_action_change_sensitivity_flags (action, LOCKDOWN_FLAG, disabled); fullscreen = eel_gconf_get_boolean (CONF_LOCKDOWN_FULLSCREEN); diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index 5cf152168..f69d25a3c 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -739,5 +739,6 @@ ephy_toolbar_new (EphyWindow *window) return EPHY_TOOLBAR (g_object_new (EPHY_TYPE_TOOLBAR, "window", window, "ui-manager", ephy_window_get_ui_manager (window), + "visibility-path", "/menubar/ViewMenu/ViewTogglesGroup/ToolbarMenu", NULL)); } diff --git a/src/ephy-window.c b/src/ephy-window.c index 782033f42..0402496f2 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -120,6 +120,7 @@ static const GtkActionEntry ephy_menu_entries [] = { { "Tools", NULL, N_("T_ools") }, { "Tabs", NULL, N_("_Tabs") }, { "Help", NULL, N_("_Help") }, + { "Toolbar", NULL, N_("_Toolbars") }, { "PopupAction", NULL, "" }, { "NotebookPopupAction", NULL, "" }, @@ -190,15 +191,15 @@ static const GtkActionEntry ephy_menu_entries [] = { N_("Manage Certificates"), G_CALLBACK (window_cmd_edit_certificates) }, #endif - { "EditToolbar", NULL, N_("T_oolbars"), NULL, - N_("Customize toolbars"), - G_CALLBACK (window_cmd_edit_toolbar) }, { "EditPrefs", GTK_STOCK_PREFERENCES, N_("P_references"), NULL, N_("Configure the web browser"), G_CALLBACK (window_cmd_edit_prefs) }, /* 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) }, @@ -279,7 +280,7 @@ static const GtkToggleActionEntry ephy_menu_toggle_entries [] = /* View Menu */ - { "ViewToolbar", NULL, N_("_Toolbar"), "<shift><control>T", + { "ViewToolbar", NULL, N_("_Show Toolbars"), "<shift><control>T", N_("Show or hide toolbar"), G_CALLBACK (ephy_window_view_toolbar_cb), TRUE }, { "ViewStatusbar", NULL, N_("St_atusbar"), NULL, |