diff options
author | Jean-François Rameau <jframeau@cvs.gnome.org> | 2006-11-13 05:03:42 +0800 |
---|---|---|
committer | Jean-François Rameau <jframeau@src.gnome.org> | 2006-11-13 05:03:42 +0800 |
commit | c6d4a2648b2221359d67f5d04b4aaa565efff640 (patch) | |
tree | d0ac8c1418d6d7954d7a4022d32b8e389bfa4b54 | |
parent | 9109b29690cf37bbd995367900775ce015406f80 (diff) | |
download | gsoc2013-epiphany-c6d4a2648b2221359d67f5d04b4aaa565efff640.tar.gz gsoc2013-epiphany-c6d4a2648b2221359d67f5d04b4aaa565efff640.tar.zst gsoc2013-epiphany-c6d4a2648b2221359d67f5d04b4aaa565efff640.zip |
Remove a double call to history copy when middle-clicking on back/forward
2006-11-12 Jean-François Rameau <jframeau@cvs.gnome.org>
* 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.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | src/ephy-navigation-action.c | 1 | ||||
-rw-r--r-- | src/ephy-shell.c | 18 |
3 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,11 @@ +2006-11-12 Jean-François Rameau <jframeau@cvs.gnome.org> + + * 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. + 2006-11-12 Ryan Lortie <desrt@desrt.ca> * src/ephy-notebook.c (build_tab_label): Remove redundant 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; } |