aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@src.gnome.org>2008-05-24 20:27:34 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2008-05-24 20:27:34 +0800
commit4543832a9b546ee50415e0a93a229864d58b8f4b (patch)
tree4d3ab2e804d4df1df749785e025eef30105dd884
parent489a5a9563f723aefe67f9f4dfcf98199991939a (diff)
downloadgsoc2013-epiphany-4543832a9b546ee50415e0a93a229864d58b8f4b.tar
gsoc2013-epiphany-4543832a9b546ee50415e0a93a229864d58b8f4b.tar.gz
gsoc2013-epiphany-4543832a9b546ee50415e0a93a229864d58b8f4b.tar.bz2
gsoc2013-epiphany-4543832a9b546ee50415e0a93a229864d58b8f4b.tar.lz
gsoc2013-epiphany-4543832a9b546ee50415e0a93a229864d58b8f4b.tar.xz
gsoc2013-epiphany-4543832a9b546ee50415e0a93a229864d58b8f4b.tar.zst
gsoc2013-epiphany-4543832a9b546ee50415e0a93a229864d58b8f4b.zip
Fix the window title copying status bar's text, closes: #524587
svn path=/trunk/; revision=8250
-rw-r--r--embed/ephy-embed-utils.c21
1 files 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 : "";