aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2007-11-17 21:51:42 +0800
committerXan Lopez <xan@src.gnome.org>2007-11-17 21:51:42 +0800
commit44b538bb4dfcdd9d8989b8777c699f08dd034061 (patch)
tree896e35599c0e75298f52c8655ea3168fc87f0129 /embed/mozilla
parent5d59fe5c78d81f6bdb110376e6657a157e1a5623 (diff)
downloadgsoc2013-epiphany-44b538bb4dfcdd9d8989b8777c699f08dd034061.tar
gsoc2013-epiphany-44b538bb4dfcdd9d8989b8777c699f08dd034061.tar.gz
gsoc2013-epiphany-44b538bb4dfcdd9d8989b8777c699f08dd034061.tar.bz2
gsoc2013-epiphany-44b538bb4dfcdd9d8989b8777c699f08dd034061.tar.lz
gsoc2013-epiphany-44b538bb4dfcdd9d8989b8777c699f08dd034061.tar.xz
gsoc2013-epiphany-44b538bb4dfcdd9d8989b8777c699f08dd034061.tar.zst
gsoc2013-epiphany-44b538bb4dfcdd9d8989b8777c699f08dd034061.zip
Re-enable popup management code in EphyBaseEmbed.
Plus a small bugfix in MozillaEmbed about GtkMozembed vs. EphyEmbed confusion. svn path=/trunk/; revision=7711
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/mozilla-embed.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 6470a739d..cca08a749 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -82,9 +82,6 @@ static void mozilla_embed_title_change_cb (GtkMozEmbed *embed,
MozillaEmbed *membed);
static void mozilla_embed_link_message_cb (GtkMozEmbed *embed,
MozillaEmbed *membed);
-static void mozilla_embed_favicon_cb (MozillaEmbed *membed,
- const char *address,
- GtkMozEmbed *embed);
static gboolean mozilla_embed_open_uri_cb (GtkMozEmbed *embed,
const char *uri,
MozillaEmbed *membed);
@@ -892,7 +889,7 @@ update_load_state (MozillaEmbed *membed, gint state)
char *address;
address = gtk_moz_embed_get_location (moz_embed);
- g_signal_emit_by_name (membed, "ge-content-change", address);
+ ephy_base_embed_popups_manager_reset (EPHY_BASE_EMBED (membed));
ephy_base_embed_restore_zoom_level (EPHY_BASE_EMBED (membed), address);
g_free (address);
}
@@ -921,6 +918,7 @@ update_load_state (MozillaEmbed *membed, gint state)
char *address;
address = gtk_moz_embed_get_location (moz_embed);
+ ephy_base_embed_popups_manager_reset (EPHY_BASE_EMBED (membed));
ephy_base_embed_restore_zoom_level (EPHY_BASE_EMBED (membed), address);
g_free (address);
}
@@ -1117,7 +1115,7 @@ mozilla_embed_new_window_cb (GtkMozEmbed *embed,
g_signal_emit_by_name (membed, "ge-new-window", new_embed);
- *newEmbed = GTK_MOZ_EMBED (new_embed);
+ *newEmbed = GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (new_embed)));
}
static void