Use window_load_url when useful. Right now just a cleanup but will be

2003-06-26  Marco Pesenti Gritti  <marco@it.gnome.org>

	* src/bookmarks/ephy-bookmarks-menu.c: (go_location_cb):
	* src/ephy-favorites-menu.c: (go_location_cb):
	* src/ephy-navigation-action.c: (activate_up_menu_item_cb):
	* src/ephy-shell.c: (ephy_shell_new_tab):
	* src/toolbar.c: (go_location_cb):
	* src/window-commands.c: (window_cmd_go_home):

	Use window_load_url when useful. Right now just a cleanup
	but will be useful when mozilla focus will stop to suck.

7 files changed, 18 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 0cd7d1e59..a0d5dd28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-26  Marco Pesenti Gritti  <marco@it.gnome.org>
+
+	* src/bookmarks/ephy-bookmarks-menu.c: (go_location_cb):
+	* src/ephy-favorites-menu.c: (go_location_cb):
+	* src/ephy-navigation-action.c: (activate_up_menu_item_cb):
+	* src/ephy-shell.c: (ephy_shell_new_tab):
+	* src/toolbar.c: (go_location_cb):
+	* src/window-commands.c: (window_cmd_go_home):
+
+	Use window_load_url when useful. Right now just a cleanup
+	but will be useful when mozilla focus will stop to suck.
+
 2003-06-26  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/mozilla-embed-single.cpp:
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 932f6dbaf..8a97387ff 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -111,12 +111,7 @@ ephy_bookmarks_menu_clean (EphyBookmarksMenu *menu)
 static void
 go_location_cb (EggAction *action, char *location, EphyWindow *window)
 {
-	EphyEmbed *embed;
-
-	embed = ephy_window_get_active_embed (window);
-	g_return_if_fail (embed != NULL);
-
-	ephy_embed_load_url (embed, location);
+	ephy_window_load_url (window, location);
 }
 
 static int
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c
index e30353dac..11af64de5 100644
--- a/src/ephy-favorites-menu.c
+++ b/src/ephy-favorites-menu.c
@@ -102,12 +102,7 @@ ephy_favorites_menu_clean (EphyFavoritesMenu *wrhm)
 static void
 go_location_cb (EggAction *action, char *location, EphyWindow *window)
 {
-	EphyEmbed *embed;
-
-	embed = ephy_window_get_active_embed (window);
-	g_return_if_fail (embed != NULL);
-
-	ephy_embed_load_url (embed, location);
+	ephy_window_load_url (window, location);
 }
 
 static void
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index f53a43e82..d2ea85839 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -117,7 +117,7 @@ activate_up_menu_item_cb (GtkWidget *menu, EphyWindow *window)
 	url = g_slist_nth_data (l, go_nth);
 	if (url)
 	{
-		ephy_embed_load_url (embed, url);
+		ephy_window_load_url (window, url);
 	}
 
 	g_slist_foreach (l, (GFunc) g_free, NULL);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 7af15a0a3..926527193 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -403,8 +403,8 @@ ephy_shell_new_tab (EphyShell *shell,
 	    flags & EPHY_NEW_TAB_NEW_PAGE)
 	{
 		ephy_tab_set_location (tab, "", TAB_ADDRESS_EXPIRE_NEXT);
-		load_homepage (embed);
 		toolbar_activate_location (toolbar);
+		load_homepage (embed);
 	}
 	else if (flags & EPHY_NEW_TAB_OPEN_PAGE)
 	{
diff --git a/src/toolbar.c b/src/toolbar.c
index e47ed7d8c..da506f8c4 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -119,12 +119,7 @@ toolbar_get_type (void)
 static void
 go_location_cb (EggAction *action, char *location, EphyWindow *window)
 {
-	EphyEmbed *embed;
-
-	embed = ephy_window_get_active_embed (window);
-	g_return_if_fail (embed != NULL);
-
-	ephy_embed_load_url (embed, location);
+	ephy_window_load_url (window, location);
 }
 
 static void
diff --git a/src/window-commands.c b/src/window-commands.c
index 74d7779f8..10e154293 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -156,16 +156,11 @@ void
 window_cmd_go_home (EggAction *action,
 		    EphyWindow *window)
 {
-	EphyEmbed *embed;
 	char *location;
 
-	embed = ephy_window_get_active_embed (window);
-	g_return_if_fail (embed != NULL);
-
 	location = eel_gconf_get_string (CONF_GENERAL_HOMEPAGE);
-	g_return_if_fail (location != NULL);
 
-	ephy_embed_load_url (embed, location);
+	ephy_window_load_url (window, location ? location : "about:blank");
 
 	g_free (location);
 }