aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-10-03 16:05:51 +0800
committerXan Lopez <xan@igalia.com>2012-10-03 16:05:51 +0800
commitc1b4e7e87652b57797c4e7e56f9c94983c5d38e7 (patch)
tree2f56e4d20ffbe15503c0d565051e1ff1d33c0f9f
parent9c54a252230ceaf38a3accd5504b3e4bd5959c48 (diff)
downloadgsoc2013-epiphany-c1b4e7e87652b57797c4e7e56f9c94983c5d38e7.tar
gsoc2013-epiphany-c1b4e7e87652b57797c4e7e56f9c94983c5d38e7.tar.gz
gsoc2013-epiphany-c1b4e7e87652b57797c4e7e56f9c94983c5d38e7.tar.bz2
gsoc2013-epiphany-c1b4e7e87652b57797c4e7e56f9c94983c5d38e7.tar.lz
gsoc2013-epiphany-c1b4e7e87652b57797c4e7e56f9c94983c5d38e7.tar.xz
gsoc2013-epiphany-c1b4e7e87652b57797c4e7e56f9c94983c5d38e7.tar.zst
gsoc2013-epiphany-c1b4e7e87652b57797c4e7e56f9c94983c5d38e7.zip
uri-tester: make it compile wth WebKit2
Still won't work, though, needs to be ported.
-rw-r--r--embed/uri-tester.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/embed/uri-tester.c b/embed/uri-tester.c
index 0b4ada297..f997cd7c4 100644
--- a/embed/uri-tester.c
+++ b/embed/uri-tester.c
@@ -31,7 +31,9 @@
#include <gio/gio.h>
#include <glib/gstdio.h>
#include <string.h>
+#ifndef HAVE_WEBKIT2
#include <webkit/webkit.h>
+#endif
#define DEFAULT_FILTER_URL "http://adblockplus.mozdev.org/easylist/easylist.txt"
#define FILTERS_LIST_FILENAME "filters.list"
@@ -113,6 +115,7 @@ uri_tester_download_notify_status_cb (WebKitDownload *download,
GParamSpec *pspec,
UriTester *tester)
{
+#ifndef HAVE_WEBKIT2
const char *dest = NULL;
if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_FINISHED)
@@ -125,11 +128,13 @@ uri_tester_download_notify_status_cb (WebKitDownload *download,
/* Parse the file from disk. */
dest = webkit_download_get_destination_uri (download);
uri_tester_parse_file_at_uri (tester, dest);
+#endif
}
static void
uri_tester_retrieve_filter (UriTester *tester, const char *url, const char *fileuri)
{
+#ifndef HAVE_WEBKIT2
WebKitNetworkRequest *request = NULL;
WebKitDownload *download = NULL;
@@ -147,6 +152,7 @@ uri_tester_retrieve_filter (UriTester *tester, const char *url, const char *file
G_CALLBACK (uri_tester_download_notify_status_cb), tester);
webkit_download_start (download);
+#endif
}
static gboolean