[epiphany] Fix the build with WebKit2



commit 2dbd0a472b1a83fc2b84f3789f457819a326e60f
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Tue Feb 12 18:11:31 2013 +0100

    Fix the build with WebKit2

 embed/ephy-embed.c |   13 +++++++++++++
 embed/ephy-embed.h |    4 ++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 8ead506..a91509c 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -81,7 +81,11 @@ struct _EphyEmbedPrivate
   GtkWidget *fullscreen_message_label;
   char *fullscreen_string;
 
+#ifdef HAVE_WEBKIT2
+  WebKitURIRequest *delayed_request;
+#else
   WebKitNetworkRequest *delayed_request;
+#endif
 
   GtkWidget *overview;
   guint overview_mode : 1;
@@ -1223,11 +1227,20 @@ ephy_embed_get_overview_mode (EphyEmbed *embed)
  * Sets the #WebKitNetworkRequest that should be loaded when the tab this embed
  * is on is switched to.
  */
+#ifdef HAVE_WEBKIT2
+void
+ephy_embed_set_delayed_load_request (EphyEmbed *embed, WebKitURIRequest *request)
+#else
 void
 ephy_embed_set_delayed_load_request (EphyEmbed *embed, WebKitNetworkRequest *request)
+#endif
 {
   g_return_if_fail (EPHY_IS_EMBED (embed));
+#ifdef HAVE_WEBKIT2
+  g_return_if_fail (WEBKIT_IS_URI_REQUEST (request));
+#else
   g_return_if_fail (WEBKIT_IS_NETWORK_REQUEST (request));
+#endif
 
   g_clear_object (&embed->priv->delayed_request);
 
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index afa007e..5802cbe 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -63,7 +63,11 @@ void         ephy_embed_auto_download_url        (EphyEmbed  *embed,
 void         ephy_embed_entering_fullscreen      (EphyEmbed *embed);
 void         ephy_embed_leaving_fullscreen       (EphyEmbed *embed);
 void         ephy_embed_set_delayed_load_request (EphyEmbed *embed,
+#ifdef HAVE_WEBKIT2
+                                                  WebKitURIRequest     *request);
+#else
                                                   WebKitNetworkRequest *request);
+#endif
 gboolean     ephy_embed_has_load_pending         (EphyEmbed *embed);
 void         ephy_embed_set_overview_mode        (EphyEmbed *embed,
                                                   gboolean   overview_mode);


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