aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2009-07-21 04:17:58 +0800
committerXan Lopez <xan@gnome.org>2009-07-21 04:21:08 +0800
commit78a3806554cd947dbc78fa4da30ab37d2b968659 (patch)
tree5ddc28303a30779c5f7635bf08cca05043e3934b /embed
parent5f97a28f42941bda9b9a29d792da65f8395e651e (diff)
downloadgsoc2013-epiphany-78a3806554cd947dbc78fa4da30ab37d2b968659.tar
gsoc2013-epiphany-78a3806554cd947dbc78fa4da30ab37d2b968659.tar.gz
gsoc2013-epiphany-78a3806554cd947dbc78fa4da30ab37d2b968659.tar.bz2
gsoc2013-epiphany-78a3806554cd947dbc78fa4da30ab37d2b968659.tar.lz
gsoc2013-epiphany-78a3806554cd947dbc78fa4da30ab37d2b968659.tar.xz
gsoc2013-epiphany-78a3806554cd947dbc78fa4da30ab37d2b968659.tar.zst
gsoc2013-epiphany-78a3806554cd947dbc78fa4da30ab37d2b968659.zip
ephy-embed.c: use 'address' if 'typed-address' is NULL when updating the address
Fixes the updating of the current address before the load starts when loading pages from the command line (bug #588143)
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 18c943f6b..f7309aeb5 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -202,6 +202,12 @@ 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 |