From e5bda8ab43ca8f63376714a00dea3228ada16a9e Mon Sep 17 00:00:00 2001
From: Philip Langdale <philipl@mail.utexas.edu>
Date: Fri, 21 Oct 2005 16:15:10 +0000
Subject: Point main menu UI at toolbar actions. Don't try and change the state
 of

2005-10-21  Philip Langdale  <philipl@mail.utexas.edu>

	* data/ui/epiphany-ui.xml:
	Point main menu UI at toolbar actions.
	* src/ephy-lockdown.c:
	(update_window): Don't try and change the state of
	the now non-existent menu specific actions.
	* src/ephy-toolbar.c
	(ephy_toolbar_set_window): Sync up toolbar actions
	so that they will appear in menus to be identical to
	the old menu specific actions. This just means adding
	accelerators and shortcuts and adjusting tooltip text.
	* src/ephy-window.c
	(sync_tab_navigation): Remove the menu specific actions
	and consequently, don't try to manipulate them.
	* src/window-commands.c
	* src/window-commands.h:
	(window_cmd_go_up): Remove unused callback.
---
 data/ui/epiphany-ui.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'data')

diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 1e30279c5..0bf29d3de 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -58,9 +58,9 @@
 </menu>
 
 <menu name="GoMenu" action="Go">
-	<menuitem name="GoBackMenu" action="GoBack"/>
-	<menuitem name="GoForwardMenu" action="GoForward"/>
-	<menuitem name="GoUpMenu" action="GoUp"/>
+	<menuitem name="GoBackMenu" action="NavigationBack"/>
+	<menuitem name="GoForwardMenu" action="NavigationForward"/>
+	<menuitem name="GoUpMenu" action="NavigationUp"/>
 	<separator name="GoSep1"/>
 	<menuitem name="GoHomeMenu" action="GoHome"/>	
 	<menuitem name="GoHistoryMenu" action="GoHistory"/>
@@ -109,8 +109,8 @@
 </popup>
 
 <popup name="EphyDocumentPopup" action="PopupAction">
-	<menuitem name="GoBackDP" action="GoBack"/>
-	<menuitem name="GoForwardDP" action="GoForward"/>
+	<menuitem name="GoBackDP" action="NavigationBack"/>
+	<menuitem name="GoForwardDP" action="NavigationForward"/>
 	<menuitem name="GoReloadDP" action="ViewReload"/>
 	<separator name="DPSep1"/>
 	<menuitem name="EditCopyDP" action="EditCopy"/>
@@ -125,8 +125,8 @@
 </popup>
 
 <popup name="EphyFullscreenDocumentPopup" action="PopupAction">
-	<menuitem name="GoBackFSDP" action="GoBack"/>
-	<menuitem name="GoForwardFSDP" action="GoForward"/>
+	<menuitem name="GoBackFSDP" action="NavigationBack"/>
+	<menuitem name="GoForwardFSDP" action="NavigationForward"/>
 	<menuitem name="GoReloadFSDP" action="ViewReload"/>
 	<separator />
 	<menuitem name="EditCopyFSDP" action="EditCopy"/>
@@ -143,8 +143,8 @@
 </popup>
 
 <popup name="EphyFramedDocumentPopup" action="PopupAction">
-	<menuitem name="GoBackFDP" action="GoBack"/>
-	<menuitem name="GoForwardFDP" action="GoForward"/>
+	<menuitem name="GoBackFDP" action="NavigationBack"/>
+	<menuitem name="GoForwardFDP" action="NavigationForward"/>
 	<menuitem name="GoReloadFDP" action="ViewReload"/>
 	<separator />
 	<menuitem name="EditCopyFDP" action="EditCopy"/>
@@ -161,8 +161,8 @@
 </popup>
 
 <popup name="EphyFullscreenFramedDocumentPopup" action="PopupAction">
-	<menuitem name="GoBackFSFDP" action="GoBack"/>
-	<menuitem name="GoForwardFSFDP" action="GoForward"/>
+	<menuitem name="GoBackFSFDP" action="NavigationBack"/>
+	<menuitem name="GoForwardFSFDP" action="NavigationForward"/>
 	<menuitem name="GoReloadFSFDP" action="ViewReload"/>
 	<separator />
 	<menuitem name="EditCopyFSFDP" action="EditCopy"/>
-- 
cgit v1.2.3