[epiphany] ephy-web-view: Don't change is_blank property depending on the title
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-web-view: Don't change is_blank property depending on the title
- Date: Fri, 11 Jan 2013 09:03:40 +0000 (UTC)
commit 3d5f2529cb79344cce1ab87eaf3ec99bd0d31196
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Fri Jan 11 09:14:04 2013 +0100
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
embed/ephy-web-view.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index c09be65..51f3493 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]