From 41bc26c1450bf508f3a8a3735c881348264caf33 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Wed, 2 Feb 2011 13:10:36 +0100 Subject: [PATCH] * Non-maintainer upload. * debian/patches: - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, fix adblock extension. closes: #611682 * debian/rules: - remove .lock-script in clean target. --- debian/changelog | 11 ++++++++ ...k-if-main-frame-in-provisional-state.patch | 26 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 4 files changed, 39 insertions(+) create mode 100644 debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch diff --git a/debian/changelog b/debian/changelog index 6dfd55a6..76578e02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +midori (0.3.0-1.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches: + - 0001-Only-no-adblock-if-main-frame-in-provisional-state added, fix + adblock extension. closes: #611682 + * debian/rules: + - remove .lock-script in clean target. + + -- Yves-Alexis Perez Wed, 02 Feb 2011 10:14:47 +0100 + midori (0.3.0-1.1) unstable; urgency=low * Non-maintainer upload. 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 new file mode 100644 index 00000000..f1cafcc9 --- /dev/null +++ b/debian/patches/0001-Only-no-adblock-if-main-frame-in-provisional-state.patch @@ -0,0 +1,26 @@ +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 5367257f..aaca60cd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ add-debian-searches +0001-Only-no-adblock-if-main-frame-in-provisional-state.patch diff --git a/debian/rules b/debian/rules index f1baac3d..e4f9c039 100755 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,7 @@ override_dh_auto_clean: $(WAF) --nocache distclean rm -rf _build_ rm -rf .waf* + rm -rf .lock-wscript override_dh_auto_configure: $(WAF) --nocache configure --prefix /usr