aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed.cpp
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-28 02:18:04 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-28 02:18:04 +0800
commit648c4d43ce6d6e0e177825d80db430cb656b36d3 (patch)
tree15ac5050cd81a984e1ff30e2c58a947388b4be8f /embed/mozilla/mozilla-embed.cpp
parentfa8c6fe4a3d78d541bb28e3828a007238d9be3f9 (diff)
downloadgsoc2013-epiphany-648c4d43ce6d6e0e177825d80db430cb656b36d3.tar
gsoc2013-epiphany-648c4d43ce6d6e0e177825d80db430cb656b36d3.tar.gz
gsoc2013-epiphany-648c4d43ce6d6e0e177825d80db430cb656b36d3.tar.bz2
gsoc2013-epiphany-648c4d43ce6d6e0e177825d80db430cb656b36d3.tar.lz
gsoc2013-epiphany-648c4d43ce6d6e0e177825d80db430cb656b36d3.tar.xz
gsoc2013-epiphany-648c4d43ce6d6e0e177825d80db430cb656b36d3.tar.zst
gsoc2013-epiphany-648c4d43ce6d6e0e177825d80db430cb656b36d3.zip
2003-06-27 Marco Pesenti Gritti <marco@it.gnome.org>
* embed/ephy-embed.c: (ephy_embed_base_init): * embed/ephy-embed.h: * embed/mozilla/mozilla-embed.cpp: * src/bookmarks/ephy-bookmarks-export.c: (add_topics_list), (ephy_bookmarks_export_rdf): * src/ephy-tab.c: (ephy_tab_address_cb): * src/ephy-window.c: (ephy_window_load_url): * src/window-commands.c: (window_cmd_file_open):
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
-rw-r--r--embed/mozilla/mozilla-embed.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 831e9d059..941698dfe 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -704,8 +704,9 @@ impl_get_location (EphyEmbed *embed,
if (toplevel)
{
- l = gtk_moz_embed_get_location
- (GTK_MOZ_EMBED(embed));
+ rv = wrapper->GetMainDocumentUrl (url);
+ l = (NS_SUCCEEDED (rv) && !url.IsEmpty()) ?
+ g_strdup (url.get()) : NULL;
}
else
{
@@ -1187,7 +1188,11 @@ mozilla_embed_location_changed_cb (GtkMozEmbed *embed,
* to know about it. */
if (membed->priv->no_page != 0)
{
- g_signal_emit_by_name (membed, "ge_location");
+ char *location;
+
+ location = gtk_moz_embed_get_location (embed);
+ g_signal_emit_by_name (membed, "ge_location", location);
+ g_free (location);
}
membed->priv->no_page = -1;