[Xfce4-commits] <midori:master> Guard WebKitDownload to WebKitGTK+ 1.1.2

Christian Dywan noreply at xfce.org
Sun Apr 25 00:16:01 CEST 2010


Updating branch refs/heads/master
         to 779c582058836d138867405e7ab0ba3737ebbc5a (commit)
       from 660ad06890f7849f764216bda8127c1a91235279 (commit)

commit 779c582058836d138867405e7ab0ba3737ebbc5a
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Apr 24 23:56:23 2010 +0200

    Guard WebKitDownload to WebKitGTK+ 1.1.2

 extensions/adblock.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 8fd25a9..b15becf 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -94,6 +94,7 @@ adblock_init_db ()
     katze_assign (blockcssprivate, g_strdup (""));
 }
 
+#if WEBKIT_CHECK_VERSION (1, 1, 2)
 static void
 adblock_download_notify_status_cb (WebKitDownload* download,
                                    GParamSpec*     pspec,
@@ -107,6 +108,7 @@ adblock_download_notify_status_cb (WebKitDownload* download,
     g_free (path);
     /* g_object_unref (download); */
 }
+#endif
 
 static gchar*
 adblock_get_filename_for_uri (const gchar* uri)
@@ -163,6 +165,7 @@ adblock_reload_rules (MidoriExtension* extension,
 
             if (!adblock_parse_file (path))
             {
+                #if WEBKIT_CHECK_VERSION (1, 1, 2)
                 WebKitNetworkRequest* request;
                 WebKitDownload* download;
                 gchar* destination = g_filename_to_uri (path, NULL, NULL);
@@ -175,6 +178,7 @@ adblock_reload_rules (MidoriExtension* extension,
                 g_signal_connect (download, "notify::status",
                     G_CALLBACK (adblock_download_notify_status_cb), path);
                 webkit_download_start (download);
+                #endif
             }
             else
                 g_free (path);



More information about the Xfce4-commits mailing list