aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2013-03-26 20:38:11 +0800
committerXan Lopez <xan@igalia.com>2013-03-26 20:38:11 +0800
commitdbf10c73ca6a84461031306a3e62408154f5dfb8 (patch)
tree12e7566fcdd0251992adca6b6183187dc08c5286
parent37b29d47edee994487e0216f8b1e76705cee899c (diff)
downloadgsoc2013-epiphany-dbf10c73ca6a84461031306a3e62408154f5dfb8.tar
gsoc2013-epiphany-dbf10c73ca6a84461031306a3e62408154f5dfb8.tar.gz
gsoc2013-epiphany-dbf10c73ca6a84461031306a3e62408154f5dfb8.tar.bz2
gsoc2013-epiphany-dbf10c73ca6a84461031306a3e62408154f5dfb8.tar.lz
gsoc2013-epiphany-dbf10c73ca6a84461031306a3e62408154f5dfb8.tar.xz
gsoc2013-epiphany-dbf10c73ca6a84461031306a3e62408154f5dfb8.tar.zst
gsoc2013-epiphany-dbf10c73ca6a84461031306a3e62408154f5dfb8.zip
ephy-encoding-dialog: use the right signal to track load status
There's no notify::load-status in WebKit2
-rw-r--r--src/ephy-encoding-dialog.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 0e56cd2e7..ac5d89a1c 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -162,9 +162,15 @@ out:
static void
+#ifdef HAVE_WEBKIT2
+embed_net_stop_cb (EphyWebView *view,
+ WebKitLoadEvent load_event,
+ EphyEncodingDialog *dialog)
+#else
embed_net_stop_cb (EphyWebView *view,
GParamSpec *pspec,
EphyEncodingDialog *dialog)
+#endif
{
if (ephy_web_view_is_loading (view) == FALSE)
sync_encoding_against_embed (dialog);
@@ -183,8 +189,13 @@ sync_embed_cb (EphyEncodingDialog *dialog, GParamSpec *pspec, gpointer dummy)
dialog);
}
+#ifdef HAVE_WEBKIT2
+ g_signal_connect (G_OBJECT (ephy_embed_get_web_view (embed)), "load-changed",
+ G_CALLBACK (embed_net_stop_cb), dialog);
+#else
g_signal_connect (G_OBJECT (ephy_embed_get_web_view (embed)), "notify::load-status",
G_CALLBACK (embed_net_stop_cb), dialog);
+#endif
dialog->priv->embed = embed;
sync_encoding_against_embed (dialog);