aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-06-28 19:38:13 +0800
committerXan Lopez <xan@igalia.com>2012-06-28 19:39:38 +0800
commite3f51b0a10803b2c555a7416f63e2376302e991c (patch)
tree77b1f37420e8dc51ad37895c810ca7a1ad0e46a4 /embed
parente28f57bde15eebfc46e238de768298134653fde3 (diff)
downloadgsoc2013-epiphany-e3f51b0a10803b2c555a7416f63e2376302e991c.tar
gsoc2013-epiphany-e3f51b0a10803b2c555a7416f63e2376302e991c.tar.gz
gsoc2013-epiphany-e3f51b0a10803b2c555a7416f63e2376302e991c.tar.bz2
gsoc2013-epiphany-e3f51b0a10803b2c555a7416f63e2376302e991c.tar.lz
gsoc2013-epiphany-e3f51b0a10803b2c555a7416f63e2376302e991c.tar.xz
gsoc2013-epiphany-e3f51b0a10803b2c555a7416f63e2376302e991c.tar.zst
gsoc2013-epiphany-e3f51b0a10803b2c555a7416f63e2376302e991c.zip
ephy-web-view: get rid of redundant calls to set_title
Just trust the title-updated signal for the most part. Seems to work just fine in WK1, and fixes missing updates to the title in WK2. https://bugzilla.gnome.org/show_bug.cgi?id=679046
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-web-view.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 8c61e40dc..91ba2ae4b 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2050,7 +2050,6 @@ ephy_web_view_location_changed (EphyWebView *view,
char *new_address = g_strdup_printf ("about:%s", location + EPHY_ABOUT_SCHEME_LEN + 1);
ephy_web_view_set_address (view, new_address);
g_free (new_address);
- ephy_web_view_set_title (view, EMPTY_PAGE);
} else {
/* We do this to get rid of an eventual password in the URL. */
ephy_web_view_set_address (view, location);
@@ -2093,10 +2092,8 @@ load_changed_cb (WebKitWebView *web_view,
loading_uri = webkit_web_view_get_uri (web_view);
g_signal_emit_by_name (view, "new-document-now", loading_uri);
- if (priv->address == NULL || priv->address[0] == '\0') {
+ if (priv->address == NULL || priv->address[0] == '\0')
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);
@@ -2117,8 +2114,6 @@ load_changed_cb (WebKitWebView *web_view,
uri = webkit_web_view_get_uri (web_view);
ephy_web_view_location_changed (view, uri);
- ephy_web_view_set_title (view, NULL);
-
/* Security status. */
if (uri && g_str_has_prefix (uri, "https")) {
#if 0
@@ -2259,10 +2254,8 @@ 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') {
+ if (priv->address == NULL || priv->address[0] == '\0')
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);
@@ -2281,8 +2274,6 @@ load_status_cb (WebKitWebView *web_view,
ephy_web_view_location_changed (view,
uri);
- ephy_web_view_set_title (view, NULL);
-
/* Security status. */
if (uri && g_str_has_prefix (uri, "https")) {
WebKitWebFrame *frame;