diff options
| author | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2008-05-24 20:28:36 +0800 |
|---|---|---|
| committer | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2008-05-24 20:28:36 +0800 |
| commit | 997651191983ed1b6d6f9e87ae4803e7354dd576 (patch) | |
| tree | 01f376bca70400bd0674c0df2e47bb39e23b35e5 | |
| parent | f9247cb83f98f6572fbc4edaf30b925eb2b2fdae (diff) | |
| download | gsoc2013-epiphany-997651191983ed1b6d6f9e87ae4803e7354dd576.tar gsoc2013-epiphany-997651191983ed1b6d6f9e87ae4803e7354dd576.tar.gz gsoc2013-epiphany-997651191983ed1b6d6f9e87ae4803e7354dd576.tar.bz2 gsoc2013-epiphany-997651191983ed1b6d6f9e87ae4803e7354dd576.tar.lz gsoc2013-epiphany-997651191983ed1b6d6f9e87ae4803e7354dd576.tar.xz gsoc2013-epiphany-997651191983ed1b6d6f9e87ae4803e7354dd576.tar.zst gsoc2013-epiphany-997651191983ed1b6d6f9e87ae4803e7354dd576.zip | |
Fix the window title copying status bar's text, closes: #524587.
svn path=/branches/gnome-2-22/; revision=8251
| -rw-r--r-- | embed/ephy-embed-utils.c | 21 |
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 : ""; |