aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-session.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-session.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-session.c')
-rw-r--r--src/ephy-session.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 1b7a5ef21..4591b4962 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -517,17 +517,14 @@ static int
write_tab (xmlTextWriterPtr writer,
EphyTab *tab)
{
- EphyEmbed *embed;
- char *location;
+ const char *address;
int ret;
ret = xmlTextWriterStartElement (writer, (xmlChar *) "embed");
if (ret < 0) return ret;
- embed = ephy_tab_get_embed (tab);
- location = ephy_embed_get_location (embed, TRUE);
- ret = xmlTextWriterWriteAttribute (writer, (xmlChar *) "url", (xmlChar *) location);
- g_free (location);
+ address = ephy_tab_get_address (tab);
+ ret = xmlTextWriterWriteAttribute (writer, (xmlChar *) "url", (xmlChar *) address);
if (ret < 0) return ret;
ret = xmlTextWriterEndElement (writer); /* embed */