Do not show about:blank to the user, an empty address bar will do better.

2004-02-26  Marco Pesenti Gritti  <marco@gnome.org>

        * src/ephy-tab.c: (ephy_tab_address_cb), (ensure_page_info):

        Do not show about:blank to the user, an empty address bar
        will do better.
        When the address bar is empty (no page or blank page is
        loaded) set the address before loading succeeded.

2 files changed, 24 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d5c464a6a..27a907ee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-26  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* src/ephy-tab.c: (ephy_tab_address_cb), (ensure_page_info):
+
+	Do not show about:blank to the user, an empty address bar
+	will do better.
+	When the address bar is empty (no page or blank page is
+	loaded) set the address before loading succeeded.
+
 2004-02-25  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/window-commands.c: (open_response_cb):
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 7d79d46af..fe47a88e7 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -621,11 +621,24 @@ ephy_tab_link_message_cb (EphyEmbed *embed,
 static void
 ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
 {
+	const char *uv_address;
+
 	LOG ("ephy_tab_address_cb tab %p address %s", tab, address)
 
+	/* Do not expose about:blank to the user, an empty address
+	   bar will do better */
+	if (address && strcmp (address, "about:blank") == 0)
+	{
+		uv_address = "";
+	}
+	else
+	{
+		uv_address = address;
+	}
+
 	if (tab->priv->address_expire == TAB_ADDRESS_EXPIRE_NOW)
 	{
-		ephy_tab_set_location (tab, address, TAB_ADDRESS_EXPIRE_NOW);
+		ephy_tab_set_location (tab, uv_address, TAB_ADDRESS_EXPIRE_NOW);
 	}
 
 	ephy_tab_set_link_message (tab, NULL);
@@ -842,7 +855,7 @@ build_progress_from_requests (EphyTab *tab, EmbedState state)
 static void
 ensure_page_info (EphyTab *tab, const char *address)
 {
-	if (tab->priv->address == NULL &&
+	if ((tab->priv->address == NULL || *tab->priv->address == '\0') &&
 	    tab->priv->address_expire == TAB_ADDRESS_EXPIRE_NOW)
         {
 		ephy_tab_set_location (tab, address, TAB_ADDRESS_EXPIRE_NOW);