Rewrite the url typed by user overwrite logic to fix bugs.

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

	* embed/mozilla/EphyWrapper.cpp:
	* lib/widgets/ephy-location-entry.c:
	(ephy_location_entry_class_init), (location_focus_out_cb),
	(ephy_location_entry_init), (insert_text_cb),
	(ephy_location_entry_key_press_event_cb),
	(ephy_location_entry_activate_cb),
	(ephy_location_entry_set_location),
	(ephy_location_entry_autocompletion_window_url_selected_cb),
	(ephy_location_entry_autocompletion_window_url_activated_cb),
	(ephy_location_entry_editable_changed_cb):
	* lib/widgets/ephy-location-entry.h:
	* src/ephy-shell.c: (ephy_shell_new_tab):
	* src/ephy-tab.c: (ephy_tab_set_property),
	(ephy_tab_set_link_message), (ephy_tab_set_window),
	(ephy_tab_address_cb), (ensure_address), (ephy_tab_net_state_cb),
	(ephy_tab_init), (ephy_tab_update_navigation_flags),
	(ephy_tab_set_location):
	* src/ephy-tab.h:
	* src/ephy-window.c: (ephy_window_notebook_switch_page_cb):
	* src/popup-commands.c: (get_event_info),
	(popup_cmd_copy_link_address):
	* src/toolbar.c: (get_location_entry), (location_user_changed_cb),
	(toolbar_set_window), (toolbar_activate_location),
	(toolbar_set_location), (toolbar_get_location),
	(toolbar_clear_location_history):
	* src/toolbar.h:

	Rewrite the url typed by user overwrite logic to fix bugs.

1 files changed, 1 insertions, 19 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index dc2b39983..1af5df479 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1792,16 +1792,6 @@ ephy_window_get_tabs (EphyWindow *window)
 }
 
 static void
-save_old_embed_status (EphyTab *tab, EphyWindow *window)
-{
-	char *location;
-
-	location = toolbar_get_location (window->priv->toolbar);
-	ephy_tab_set_location (tab, location);
-	g_free (location);
-}
-
-static void
 update_embed_dialogs (EphyWindow *window,
 		      EphyTab *tab)
 {
@@ -1824,7 +1814,7 @@ ephy_window_notebook_switch_page_cb (GtkNotebook *notebook,
 				     guint page_num,
 				     EphyWindow *window)
 {
-	EphyTab *tab, *old_tab;
+	EphyTab *tab;
 
 	g_return_if_fail (IS_EPHY_WINDOW (window));
 	if (window->priv->closing) return;
@@ -1832,14 +1822,6 @@ ephy_window_notebook_switch_page_cb (GtkNotebook *notebook,
 	/* get the new tab */
 	tab = real_get_active_tab (window, page_num);
 
-	/* update old tab */
-	old_tab = window->priv->active_tab;
-	if (old_tab && tab != old_tab)
-	{
-		g_return_if_fail (IS_EPHY_TAB (G_OBJECT (old_tab)));
-		save_old_embed_status (old_tab, window);
-	}
-
 	/* update new tab */
 	ephy_window_set_active_tab (window, tab);