diff --git a/debian/changelog b/debian/changelog index db573f6e..2c334bb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ midori (0.3.1-0.1) UNRELEASED; urgency=low * Non maintainer upload. * New upstream release. + * debian/patches: + - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, included + upstream. - -- Yves-Alexis Perez Sat, 19 Feb 2011 23:40:19 +0100 + -- Yves-Alexis Perez Sat, 19 Feb 2011 23:43:48 +0100 midori (0.3.0-1.3) unstable; urgency=low diff --git a/debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch b/debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch deleted file mode 100644 index f1cafcc9..00000000 --- a/debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 90e11d3713f68fece0b28cc2a1bda3dde8aa3303 Mon Sep 17 00:00:00 2001 -From: Christian Dywan -Date: Tue, 1 Feb 2011 01:52:39 +0100 -Subject: [PATCH] Only no adblock if main frame in provisional state - ---- - extensions/adblock.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/extensions/adblock.c b/extensions/adblock.c -index 6ae7adc..ff08b67 100644 ---- a/extensions/adblock.c -+++ b/extensions/adblock.c -@@ -753,7 +753,8 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view, - const char *page_uri; - - /* Never filter the main page itself */ -- if (web_frame == webkit_web_view_get_main_frame (web_view)) -+ if (web_frame == webkit_web_view_get_main_frame (web_view) -+ && webkit_web_frame_get_load_status (web_frame) == WEBKIT_LOAD_PROVISIONAL) - return; - - req_uri = webkit_network_request_get_uri (request); --- -1.7.2.3 - diff --git a/debian/patches/series b/debian/patches/series index aaca60cd..5367257f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ add-debian-searches -0001-Only-no-adblock-if-main-frame-in-provisional-state.patch