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-location-action.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/ephy-location-action.c') diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index 773743bea..4cce221cf 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -282,11 +282,13 @@ static char * get_location_cb (EphyLocationEntry *entry, EphyLocationAction *action) { - EphyEmbed *embed; - - embed = ephy_window_get_active_embed (action->priv->window); + EphyLocationActionPrivate *priv = action->priv; + EphyTab *tab; - return ephy_embed_get_location (embed, TRUE); + tab = ephy_window_get_active_tab (priv->window); + g_return_val_if_fail (tab != NULL, NULL); + + return g_strdup (ephy_tab_get_address (tab)); } static char * -- cgit v1.2.3