[epiphany/gnome-3-8] ephy-encoding-dialog: use the right signal to track load status



commit 5ba907ed334369cf58c2de0f0e5a747c295ba7ce
Author: Xan Lopez <xan igalia com>
Date:   Tue Mar 26 13:38:11 2013 +0100

    ephy-encoding-dialog: use the right signal to track load status
    
    There's no notify::load-status in WebKit2

 src/ephy-encoding-dialog.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 0e56cd2..ac5d89a 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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]