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. --- embed/ephy-embed.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'embed/ephy-embed.c') diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index f7309aeb5..18c943f6b 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -202,12 +202,6 @@ load_status_changed_cb (WebKitWebView *view, } else { EphyWebViewNetState estate = EPHY_WEB_VIEW_STATE_UNKNOWN; const char *loading_uri = ephy_web_view_get_typed_address (EPHY_WEB_VIEW (view)); - /* FIXME: typed address might be NULL when, for example, loading - from command line, so try plain address if that's the - case. This should be fixed to get the address from just one - place... */ - if (loading_uri == NULL) - loading_uri = ephy_web_view_get_address (EPHY_WEB_VIEW (view)); if (status == WEBKIT_LOAD_PROVISIONAL) { estate = (EphyWebViewNetState) (estate | -- cgit v1.2.3