window: Merge app.reopen-closed-tab and tab.reopen

There's no difference between them, let's display shortcut in the menu
instead.

3 files changed, 1 insertions, 27 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index 7d934e9ea..d07a6a134 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -886,7 +886,6 @@ static const GActionEntry tab_entries [] = {
   { "move-right", window_cmd_tabs_move_right },
   { "close-others", window_cmd_tabs_close_others },
   { "reload", window_cmd_tabs_reload },
-  { "reopen", window_cmd_tabs_reopen_closed_tab },
   { "reload-all", window_cmd_tabs_reload_all_tabs },
   { "pin", window_cmd_tabs_pin },
   { "unpin", window_cmd_tabs_unpin },
@@ -3735,7 +3734,6 @@ ephy_window_constructed (GObject *object)
   EphyEmbedShellMode mode;
   EphyWindowChrome chrome = EPHY_WINDOW_CHROME_DEFAULT;
   GApplication *app;
-  EphySession *session;
 
   G_OBJECT_CLASS (ephy_window_parent_class)->constructed (object);
 
@@ -3907,19 +3905,6 @@ ephy_window_constructed (GObject *object)
     g_object_set (window->location_controller, "editable", FALSE, NULL);
   }
 
-  action_group = gtk_widget_get_action_group (GTK_WIDGET (window), "tab");
-  action = g_action_map_lookup_action (G_ACTION_MAP (action_group), "reopen");
-  session = ephy_shell_get_session (shell);
-  if (session) {
-    g_object_bind_property (session,
-                            "can-undo-tab-closed",
-                            action,
-                            "enabled",
-                            G_BINDING_SYNC_CREATE);
-  } else {
-    g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE);
-  }
-
   window->mouse_gesture_controller = ephy_mouse_gesture_controller_new (window);
 
   ephy_window_set_chrome (window, chrome);
diff --git a/src/resources/gtk/notebook-context-menu.ui b/src/resources/gtk/notebook-context-menu.ui
index e4730d4f1..c5a608e8f 100644
--- a/src/resources/gtk/notebook-context-menu.ui
+++ b/src/resources/gtk/notebook-context-menu.ui
@@ -31,7 +31,7 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">Reo_pen Closed Tab</attribute>
-        <attribute name="action">tab.reopen</attribute>
+        <attribute name="action">app.reopen-closed-tab</attribute>
       </item>
     </section>
     <section>
diff --git a/src/window-commands.c b/src/window-commands.c
index fd4dafcfa..28d62c74e 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -2919,17 +2919,6 @@ window_cmd_tabs_reload_all_tabs (GSimpleAction *action,
 }
 
 void
-window_cmd_tabs_reopen_closed_tab (GSimpleAction *action,
-                                   GVariant      *parameter,
-                                   gpointer       user_data)
-{
-  EphySession *session = ephy_shell_get_session (ephy_shell_get_default ());
-
-  g_assert (session != NULL);
-  ephy_session_undo_close_tab (session);
-}
-
-void
 window_cmd_show_tab (GSimpleAction *action,
                      GVariant      *parameter,
                      gpointer       user_data)