From 997651191983ed1b6d6f9e87ae4803e7354dd576 Mon Sep 17 00:00:00 2001 From: Diego Escalante Urrelo Date: Sat, 24 May 2008 12:28:36 +0000 Subject: Fix the window title copying status bar's text, closes: #524587. svn path=/branches/gnome-2-22/; revision=8251 --- embed/ephy-embed-utils.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c index 5fe226309..e00e23528 100644 --- a/embed/ephy-embed-utils.c +++ b/embed/ephy-embed-utils.c @@ -93,27 +93,22 @@ const char * ephy_embed_utils_get_title_composite (EphyEmbed *embed) { const char *title = ""; - const char *loading_title; + const char *loading_title; gboolean is_loading, is_blank; g_return_val_if_fail (EPHY_IS_EMBED (embed), NULL); is_loading = ephy_embed_get_load_status (embed); - is_blank = ephy_embed_get_is_blank (embed); - loading_title = ephy_embed_get_loading_title (embed); + is_blank = ephy_embed_get_is_blank (embed); + loading_title = ephy_embed_get_loading_title (embed); + title = ephy_embed_get_title (embed); if (is_blank) { - title = _("Blank page"); - } - else if (is_loading && - loading_title != NULL) - { - title = loading_title; - } - else - { - title = ephy_embed_get_title (embed); + if (is_loading) + title = loading_title; + else + title = _("Blank page"); } return title != NULL ? title : ""; -- cgit v1.2.3