diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmarks-editor.c | 15 | ||||
| -rw-r--r-- | src/ephy-history-window.c | 14 |
3 files changed, 13 insertions, 23 deletions
@@ -1,3 +1,10 @@ +2003-07-30 David Bordoley <bordoley@msu.edu> + + * src/ephy-history-window.c: (ephy_history_window_node_activated_cb): + * src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_node_activated_cb): + + Always open bookmarks in new window/tab according to pref on activate. + 2003-07-30 Marco Pesenti Gritti <marco@it.gnome.org> * configure.in: diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 2556fdd99..4fd221246 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -751,18 +751,9 @@ ephy_bookmarks_editor_node_activated_cb (GtkWidget *view, g_return_if_fail (location != NULL); window = EPHY_WINDOW (get_target_window (editor)); - if (window != NULL) - { - ephy_window_load_url (EPHY_WINDOW (window), location); - gtk_window_present (GTK_WINDOW (window)); - } - else - { - /* We have to create a browser window */ - ephy_shell_new_tab (ephy_shell, NULL, NULL, location, - EPHY_NEW_TAB_OPEN_PAGE | - EPHY_NEW_TAB_IN_NEW_WINDOW); - } + + ephy_shell_new_tab (ephy_shell, window, NULL, location, + EPHY_NEW_TAB_OPEN_PAGE); } static void diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c index 6ef64dea8..03cc94467 100644 --- a/src/ephy-history-window.c +++ b/src/ephy-history-window.c @@ -608,17 +608,9 @@ ephy_history_window_node_activated_cb (GtkWidget *view, g_return_if_fail (location != NULL); window = EPHY_WINDOW (get_target_window (editor)); - if (window != NULL) - { - ephy_window_load_url (EPHY_WINDOW (window), location); - gtk_window_present (GTK_WINDOW (window)); - } - else - { - /* We have to create a browser window */ - ephy_shell_new_tab (ephy_shell, NULL, NULL, location, - EPHY_NEW_TAB_IN_NEW_WINDOW); - } + + ephy_shell_new_tab (ephy_shell, NULL, NULL, location, + EPHY_NEW_TAB_OPEN_PAGE); } static void |