[Xfce4-commits] <midori:master> Remove leftover version guards for WebKit > 1.1.17

[Christian Dywan]

Updating branch refs/heads/master
         to 3e2e8906fb452e4530800d8d27bb5dee8acb6f4e (commit)
       from 8bca83572ab43c759afc74411f4d970343eea522 (commit)

commit 3e2e8906fb452e4530800d8d27bb5dee8acb6f4e
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Mon Aug 15 22:37:59 2011 +0200

    Remove leftover version guards for WebKit > 1.1.17

 extensions/adblock.c   |    4 ----
 extensions/addons.c    |    2 --
 extensions/web-cache.c |    8 --------
 midori/midori-view.c   |    2 --
 4 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index dcde78d..3b64fee 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -107,7 +107,6 @@ adblock_init_db ()
     blockcssprivate = g_string_new ("");
 }
 
-#if WEBKIT_CHECK_VERSION (1, 1, 2)
 static void
 adblock_download_notify_status_cb (WebKitDownload* download,
                                    GParamSpec*     pspec,
@@ -121,7 +120,6 @@ 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)
@@ -178,7 +176,6 @@ 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);
@@ -191,7 +188,6 @@ 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);
diff --git a/extensions/addons.c b/extensions/addons.c
index 08eb2ab..08dc26b 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -241,10 +241,8 @@ addons_notify_load_status_cb (MidoriView*      view,
     const gchar* uri = midori_view_get_display_uri (view);
     WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
 
-    #if WEBKIT_CHECK_VERSION (1, 1, 14)
     if (webkit_web_view_get_view_source_mode (web_view))
         return;
-    #endif
 
     if (uri && *uri)
     {
diff --git a/extensions/web-cache.c b/extensions/web-cache.c
index 1f8753c..9a3d0eb 100644
--- a/extensions/web-cache.c
+++ b/extensions/web-cache.c
@@ -157,7 +157,6 @@ static void
 web_cache_set_content_type (SoupMessage* msg,
                             SoupBuffer*  buffer)
 {
-    #if WEBKIT_CHECK_VERSION (1, 1, 15)
     gchar* sniffed_type;
     SoupContentSniffer* sniffer = soup_content_sniffer_new ();
     if ((sniffed_type = soup_content_sniffer_sniff (sniffer, msg, buffer, NULL)))
@@ -171,7 +170,6 @@ web_cache_set_content_type (SoupMessage* msg,
             msg->response_headers, "Content-Type");
         g_signal_emit_by_name (msg, "content-sniffed", content_type, NULL);
     }
-    #endif
 }
 
 static void
@@ -390,7 +388,6 @@ web_cache_session_request_queued_cb (SoupSession*     session,
     g_free (uri);
 }
 
-#if WEBKIT_CHECK_VERSION (1, 1, 3)
 static void
 web_cache_add_download_cb (MidoriBrowser*   browser,
                            WebKitDownload*  download,
@@ -402,7 +399,6 @@ web_cache_add_download_cb (MidoriBrowser*   browser,
         g_object_set_data (G_OBJECT (msg), "midori-web-cache-download",
                            (gpointer)0xdeadbeef);
 }
-#endif
 
 static void
 web_cache_deactivate_cb (MidoriExtension* extension,
@@ -413,10 +409,8 @@ web_cache_app_add_browser_cb (MidoriApp*       app,
                               MidoriBrowser*   browser,
                               MidoriExtension* extension)
 {
-    #if WEBKIT_CHECK_VERSION (1, 1, 3)
     g_signal_connect (browser, "add-download",
         G_CALLBACK (web_cache_add_download_cb), extension);
-    #endif
     g_signal_connect (extension, "deactivate",
         G_CALLBACK (web_cache_deactivate_cb), browser);
 }
@@ -434,10 +428,8 @@ web_cache_deactivate_cb (MidoriExtension* extension,
         extension, web_cache_deactivate_cb, browser);
     g_signal_handlers_disconnect_by_func (
         app, web_cache_app_add_browser_cb, extension);
-    #if WEBKIT_CHECK_VERSION (1, 1, 3)
     g_signal_handlers_disconnect_by_func (
         browser, web_cache_add_download_cb, extension);
-    #endif
 }
 
 static void
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 367b4c2..3e77b38 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -69,9 +69,7 @@ struct _MidoriView
     MidoriLoadStatus load_status;
     gboolean minimized;
     gchar* statusbar_text;
-    #if WEBKIT_CHECK_VERSION (1, 1, 15)
     WebKitHitTestResult* hit_test;
-    #endif
     gchar* link_uri;
     gboolean has_selection;
     gchar* selected_text;