aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2012-06-26 16:32:12 +0800
committerClaudio Saavedra <csaavedra@igalia.com>2012-06-28 18:50:50 +0800
commitd4bef7810d2bf37c0e8c9eea9eaa65c59aece922 (patch)
treedde2077bc2f5d577f25bbb7151176f1705f8744e /embed
parentc32e0e789aaf7b6d08f04a368e4322ca8214c891 (diff)
downloadgsoc2013-epiphany-d4bef7810d2bf37c0e8c9eea9eaa65c59aece922.tar.gz
gsoc2013-epiphany-d4bef7810d2bf37c0e8c9eea9eaa65c59aece922.tar.zst
gsoc2013-epiphany-d4bef7810d2bf37c0e8c9eea9eaa65c59aece922.zip
Port fullscreen popup to WebKit2
https://bugzilla.gnome.org/show_bug.cgi?id=678840
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 9a820decf..381dd4115 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -593,7 +593,9 @@ ephy_embed_set_fullscreen_message (EphyEmbed *embed,
static gboolean
entering_fullscreen_cb (WebKitWebView *web_view,
+#ifndef HAVE_WEBKIT2
GObject *element,
+#endif
EphyEmbed *embed)
{
ephy_embed_set_fullscreen_message (embed, TRUE);
@@ -602,7 +604,9 @@ entering_fullscreen_cb (WebKitWebView *web_view,
static gboolean
leaving_fullscreen_cb (WebKitWebView *web_view,
+#ifndef HAVE_WEBKIT2
GObject *element,
+#endif
EphyEmbed *embed)
{
ephy_embed_set_fullscreen_message (embed, FALSE);
@@ -833,9 +837,11 @@ ephy_embed_constructed (GObject *object)
#ifdef HAVE_WEBKIT2
/* TODO: WebKitWebResource::send-request, Downloads */
- g_signal_connect (web_view, "load-changed",
- G_CALLBACK (load_changed_cb),
- embed);
+ g_object_connect (web_view,
+ "signal::load-changed", G_CALLBACK (load_changed_cb), embed,
+ "signal::enter-fullscreen", G_CALLBACK (entering_fullscreen_cb), embed,
+ "signal::leave-fullscreen", G_CALLBACK (leaving_fullscreen_cb), embed,
+ NULL);
#else
g_object_connect (web_view,
"signal::notify::load-status", G_CALLBACK (load_status_changed_cb), embed,