summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Mikhaylenko <alexm@gnome.org>2020-09-07 22:59:45 +0500
committerAlexander Mikhaylenko <alexm@gnome.org>2020-09-23 01:55:08 +0500
commit432d6081e83b8ee5a325095f9c4952cacd2cbaeb (patch)
treeebe84c1b8dd881018a4ffd5e55b0c43fafe428fe
parentf1e04bf29c0348e6946e446fe40600f196004b59 (diff)
downloadepiphany-432d6081e83b8ee5a325095f9c4952cacd2cbaeb.tar.gz
window: Merge toolbar.reload and tab.reload
Another duplicate.
-rw-r--r--src/ephy-window.c1
-rw-r--r--src/resources/gtk/notebook-context-menu.ui2
-rw-r--r--src/window-commands.c18
3 files changed, 1 insertions, 20 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index d07a6a134..0247993d9 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -885,7 +885,6 @@ static const GActionEntry tab_entries [] = {
{ "move-left", window_cmd_tabs_move_left },
{ "move-right", window_cmd_tabs_move_right },
{ "close-others", window_cmd_tabs_close_others },
- { "reload", window_cmd_tabs_reload },
{ "reload-all", window_cmd_tabs_reload_all_tabs },
{ "pin", window_cmd_tabs_pin },
{ "unpin", window_cmd_tabs_unpin },
diff --git a/src/resources/gtk/notebook-context-menu.ui b/src/resources/gtk/notebook-context-menu.ui
index c5a608e8f..7c61c2b7e 100644
--- a/src/resources/gtk/notebook-context-menu.ui
+++ b/src/resources/gtk/notebook-context-menu.ui
@@ -5,7 +5,7 @@
<section>
<item>
<attribute name="label" translatable="yes">R_eload</attribute>
- <attribute name="action">tab.reload</attribute>
+ <attribute name="action">toolbar.reload</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Reload _All Tabs</attribute>
diff --git a/src/window-commands.c b/src/window-commands.c
index 28d62c74e..35a35581c 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -2879,24 +2879,6 @@ window_cmd_tabs_close_others (GSimpleAction *action,
}
void
-window_cmd_tabs_reload (GSimpleAction *action,
- GVariant *parameter,
- gpointer user_data)
-{
- EphyWindow *window = user_data;
- EphyEmbed *embed;
- WebKitWebView *view;
-
- embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
- g_assert (embed != NULL);
-
- gtk_widget_grab_focus (GTK_WIDGET (embed));
-
- view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
- webkit_web_view_reload (view);
-}
-
-void
window_cmd_tabs_reload_all_tabs (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)