aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-window.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-02 03:28:53 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-02 03:28:53 +0800
commitefdde3ff63b9f0c3c3ff8c418c451be494360601 (patch)
tree6a6c07b01fc1066c12edebee0a2047777412a5cb /src/ephy-window.c
parentdd0039f8b586bee1e77bddc23bc4c67107f3c14c (diff)
downloadgsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar
gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.gz
gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.bz2
gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.lz
gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.xz
gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.tar.zst
gsoc2013-epiphany-efdde3ff63b9f0c3c3ff8c418c451be494360601.zip
Now that the tab's address is always correct (isn't the typed address
2005-08-01 Christian Persch <chpe@cvs.gnome.org> * 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.
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r--src/ephy-window.c5
1 files changed, 2 insertions, 3 deletions
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;