epiphany r8251 - branches/gnome-2-22/embed

[diegoe svn gnome org]

Author: diegoe
Date: Sat May 24 12:28:36 2008
New Revision: 8251
URL: http://svn.gnome.org/viewvc/epiphany?rev=8251&view=rev

Log:
Fix the window title copying status bar's text, closes: #524587.



Modified:
   branches/gnome-2-22/embed/ephy-embed-utils.c

Modified: branches/gnome-2-22/embed/ephy-embed-utils.c
==============================================================================
--- branches/gnome-2-22/embed/ephy-embed-utils.c	(original)
+++ branches/gnome-2-22/embed/ephy-embed-utils.c	Sat May 24 12:28:36 2008
@@ -93,27 +93,22 @@
 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 : "";