From efdde3ff63b9f0c3c3ff8c418c451be494360601 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 1 Aug 2005 19:28:53 +0000 Subject: Now that the tab's address is always correct (isn't the typed address 2005-08-01 Christian Persch * src/ephy-location-action.c: (get_location_cb): * src/ephy-session.c: (write_tab): * src/ephy-tab.c: * src/ephy-window.c: (modal_alert_cb): * src/prefs-dialog.c: (set_homepage_entry), (prefs_homepage_current_button_clicked_cb): * src/window-commands.c: (window_cmd_file_send_to), (window_cmd_file_bookmark_page), (window_cmd_view_page_source): Now that the tab's address is always correct (isn't the typed address anymore), always use ephy_tab_get_address instead of ephy_embed_get_location, since the former also gets the right address when the page loading but still blank. Should fix bug #147840. --- src/ephy-window.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/ephy-window.c') diff --git a/src/ephy-window.c b/src/ephy-window.c index 949077ca3..7da565a2e 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2035,7 +2035,7 @@ modal_alert_cb (EphyEmbed *embed, { EphyWindowPrivate *priv = window->priv; EphyTab *tab; - char *address; + const char *address; tab = ephy_tab_for_embed (embed); g_return_val_if_fail (tab != NULL, FALSE); @@ -2051,9 +2051,8 @@ modal_alert_cb (EphyEmbed *embed, gtk_window_present (GTK_WINDOW (window)); /* make sure the location entry shows the real URL of the tab's page */ - address = ephy_embed_get_location (embed, TRUE); + address = ephy_tab_get_address (tab); ephy_toolbar_set_location (priv->toolbar, address, NULL); - g_free (address); /* don't suppress alert */ return FALSE; -- cgit v1.2.3