diff options
author | Xan Lopez <xan@gnome.org> | 2009-07-21 16:12:08 +0800 |
---|---|---|
committer | Xan Lopez <xan@gnome.org> | 2009-07-21 16:12:08 +0800 |
commit | f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9 (patch) | |
tree | 7e4750218c48131a0105e739f6e4bdce24546225 /embed | |
parent | 4085c2c058bb02bbf65a929075edf2dada6dec8a (diff) | |
download | gsoc2013-epiphany-f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9.tar gsoc2013-epiphany-f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9.tar.gz gsoc2013-epiphany-f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9.tar.bz2 gsoc2013-epiphany-f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9.tar.lz gsoc2013-epiphany-f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9.tar.xz gsoc2013-epiphany-f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9.tar.zst gsoc2013-epiphany-f670d8f8c5ffddf2a72fdd91dc40c49f7ac544e9.zip |
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.
Diffstat (limited to 'embed')
-rw-r--r-- | embed/ephy-embed.c | 6 |
1 files changed, 0 insertions, 6 deletions
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 | |