From f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Tue, 21 Jul 2009 11:12:08 +0300 Subject: Try again to fix bug #588143 Simpler (and working) solution: take into account the loading status of the view when deciding if we should use it, if it's blank, to load new pages passed through the command line. --- src/ephy-shell.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ephy-shell.c b/src/ephy-shell.c index d097f4726..27f2de784 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -474,7 +474,8 @@ ephy_shell_new_tab_full (EphyShell *shell, embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); if (embed != NULL) { - if (ephy_web_view_get_is_blank (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed))) + if (ephy_web_view_get_is_blank (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)) && + ephy_web_view_get_load_status (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)) == FALSE) { active_is_blank = TRUE; } @@ -491,8 +492,8 @@ ephy_shell_new_tab_full (EphyShell *shell, if (previous_embed != NULL) { - ephy_web_view_copy_back_history (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (previous_embed)), - EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed))); + ephy_web_view_copy_back_history (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (previous_embed), + EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed)); } ephy_gui_window_update_user_time (GTK_WIDGET (window), user_time); @@ -517,7 +518,7 @@ ephy_shell_new_tab_full (EphyShell *shell, } else if (flags & EPHY_NEW_TAB_OPEN_PAGE) { - ephy_web_view_load_request (EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)), + ephy_web_view_load_request (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), request); is_empty = url_is_empty (webkit_network_request_get_uri (request)); -- cgit v1.2.3