From ae52c16129486d047b37cd0a029e5641ec396823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= <jframeau@cvs.gnome.org>
Date: Sun, 19 Jun 2005 16:39:47 +0000
Subject: Shift-Ctrl+R now works (Force reload). Fixes #307831.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2005-06-19  Jean-François Rameau  <jframeau@cvs.gnome.org>

	* data/ui/epiphany-ui.xml:
	* src/ephy-window.c:

	Shift-Ctrl+R now works (Force reload). Fixes #307831.
---
 ChangeLog               | 7 +++++++
 data/ui/epiphany-ui.xml | 1 +
 src/ephy-window.c       | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2e1a99df3..eb24e6259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-19  Jean-François Rameau  <jframeau@cvs.gnome.org>
+
+	* data/ui/epiphany-ui.xml:
+	* src/ephy-window.c:
+
+	Shift-Ctrl+R now works (Force reload). Fixes #307831.
+
 2005-06-16  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/ContentHandler.cpp:
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index ab5a0e6af..2c699c4a9 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -223,6 +223,7 @@
 
 <accelerator name="BrowseWithCaretAccel" action="BrowseWithCaret"/>
 <accelerator name="FileSaveAccel" action="FileSave"/>
+<accelerator name="ForceReloadAccel" action="ForceReload"/>
 <accelerator name="XFKeyHomePageAccel" action="XFKeyHomePage"/>
 <accelerator name="XFKeyBackAccel" action="XFKeyBack"/>
 <accelerator name="XFKeyForwardAccel" action="XFKeyForward"/>
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 1d6b22996..54a7bce81 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -204,6 +204,9 @@ static const GtkActionEntry ephy_menu_entries [] = {
 	{ "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R",
 	  N_("Display the latest content of the current page"),
 	  G_CALLBACK (window_cmd_view_reload) },
+	{ "ForceReload", NULL, "", "<shift><control>R",
+	  NULL,
+	  G_CALLBACK (window_cmd_view_reload) },
 	{ "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus",
 	  N_("Increase the text size"),
 	  G_CALLBACK (window_cmd_view_zoom_in) },
-- 
cgit v1.2.3