aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorCarlos Garcia Campos <cgarcia@igalia.com>2013-01-11 16:14:04 +0800
committerCarlos Garcia Campos <cgarcia@igalia.com>2013-01-11 16:14:04 +0800
commit3d5f2529cb79344cce1ab87eaf3ec99bd0d31196 (patch)
tree04531ef7b5e65e8c809ad4dbd7d0a41491c6e6ea /embed
parent11d8b3ed3849e4ed18e9741af5ce316c4ccb29b8 (diff)
downloadgsoc2013-epiphany-3d5f2529cb79344cce1ab87eaf3ec99bd0d31196.tar
gsoc2013-epiphany-3d5f2529cb79344cce1ab87eaf3ec99bd0d31196.tar.gz
gsoc2013-epiphany-3d5f2529cb79344cce1ab87eaf3ec99bd0d31196.tar.bz2
gsoc2013-epiphany-3d5f2529cb79344cce1ab87eaf3ec99bd0d31196.tar.lz
gsoc2013-epiphany-3d5f2529cb79344cce1ab87eaf3ec99bd0d31196.tar.xz
gsoc2013-epiphany-3d5f2529cb79344cce1ab87eaf3ec99bd0d31196.tar.zst
gsoc2013-epiphany-3d5f2529cb79344cce1ab87eaf3ec99bd0d31196.zip
ephy-web-view: Don't change is_blank property depending on the title
In WebKit1 the notify::title signal is emitted twice for every load, first with NULL to reset the title and then with the actual title. A NULL title doesn't necessarily means the page is about:blank, and the property is updated already by ephy_web_view_set_address. https://bugzilla.gnome.org/show_bug.cgi?id=691416
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-web-view.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index c09be65cf..51f3493fe 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1208,19 +1208,14 @@ ephy_web_view_set_title (EphyWebView *view,
EphyWebViewPrivate *priv = view->priv;
char *title = g_strdup (view_title);
- if (!priv->is_blank && (title == NULL || g_strstrip (title)[0] == '\0')) {
+ if (title == NULL || g_strstrip (title)[0] == '\0') {
g_free (title);
- title = get_title_from_address (priv->address);
+ title = priv->address ? get_title_from_address (priv->address) : NULL;
- /* Fallback */
if (title == NULL || title[0] == '\0') {
g_free (title);
title = g_strdup (EMPTY_PAGE);
- _ephy_web_view_set_is_blank (view, TRUE);
}
- } else if (priv->is_blank) {
- g_free (title);
- title = g_strdup (EMPTY_PAGE);
}
g_free (priv->title);