From c6d4a2648b2221359d67f5d04b4aaa565efff640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= Date: Sun, 12 Nov 2006 21:03:42 +0000 Subject: Remove a double call to history copy when middle-clicking on back/forward MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-11-12 Jean-François Rameau * src/ephy-navigation-action.c: (activate_by_history_index): * src/ephy-shell.c: (ephy_shell_new_tab_full): Remove a double call to history copy when middle-clicking on back/forward buttons. Fix bug #362882. --- src/ephy-navigation-action.c | 1 - src/ephy-shell.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index 25d0ab1a0..c9008cb9c 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -158,7 +158,6 @@ activate_by_history_index (EphyNavigationAction *action, dest = ephy_tab_get_embed (newTab); g_return_if_fail (dest != NULL); - ephy_embed_shistory_copy (embed, dest, TRUE, TRUE, FALSE); embed = dest; } ephy_embed_shistory_go_nth (embed, index); diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 30ee3135f..e6a3ecf8a 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -508,6 +508,15 @@ ephy_shell_new_tab_full (EphyShell *shell, ephy_window_add_tab (window, tab, position, jump_to); + if (previous_embed != NULL) + { + ephy_embed_shistory_copy (previous_embed, + embed, + TRUE, /* back history */ + TRUE, /* forward history */ + FALSE); /* current index */ + } + ephy_gui_window_update_user_time (GTK_WIDGET (window), user_time); if ((flags & EPHY_NEW_TAB_DONT_SHOW_WINDOW) == 0) @@ -572,15 +581,6 @@ ephy_shell_new_tab_full (EphyShell *shell, } } - if (previous_embed != NULL) - { - ephy_embed_shistory_copy (previous_embed, - embed, - TRUE, /* back history */ - FALSE, /* forward history */ - FALSE); /* current index */ - } - return tab; } -- cgit v1.2.3