aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorAlejandro G. Castro <alex@igalia.com>2010-05-04 18:33:00 +0800
committerAlejandro G. Castro <alex@igalia.com>2010-05-04 19:52:30 +0800
commit41e747ab437e9aa6d90015314f49d2955a3ef293 (patch)
tree3d559210e7a09cb79a7e46481f8c900bfd5db0fd /embed
parent7cdcf21d2d2f31a97adaea627acdffcd1b024b41 (diff)
downloadgsoc2013-epiphany-41e747ab437e9aa6d90015314f49d2955a3ef293.tar
gsoc2013-epiphany-41e747ab437e9aa6d90015314f49d2955a3ef293.tar.gz
gsoc2013-epiphany-41e747ab437e9aa6d90015314f49d2955a3ef293.tar.bz2
gsoc2013-epiphany-41e747ab437e9aa6d90015314f49d2955a3ef293.tar.lz
gsoc2013-epiphany-41e747ab437e9aa6d90015314f49d2955a3ef293.tar.xz
gsoc2013-epiphany-41e747ab437e9aa6d90015314f49d2955a3ef293.tar.zst
gsoc2013-epiphany-41e747ab437e9aa6d90015314f49d2955a3ef293.zip
Fix title modification in provisional state
Avoid setting the provisional uri as the title if there is already a typed address, and set the loading_title before using it in the status message. Bug #593743
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-web-view.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 8f77b120a..b10e38a41 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2029,15 +2029,17 @@ load_status_cb (WebKitWebView *web_view,
g_signal_emit_by_name (view, "new-document-now", loading_uri);
if ((priv->address == NULL || priv->address[0] == '\0') &&
- priv->expire_address_now == TRUE)
+ priv->expire_address_now == TRUE) {
ephy_web_view_set_address (view, loading_uri);
+ ephy_web_view_set_title (view, NULL);
+ }
+
+ ephy_web_view_set_loading_title (view, loading_uri, TRUE);
g_free (priv->status_message);
priv->status_message = g_strdup (priv->loading_title);
g_object_notify (object, "status-message");
- ephy_web_view_set_title (view, NULL);
- ephy_web_view_set_loading_title (view, loading_uri, TRUE);
priv->expire_address_now = TRUE;
}
break;