Package: midori Version: 0.3.0-1.1 Severity: normal Tags: patch Hi,
midori 0.3.0 was released with broken adblock. Reverting commit 2e35f1718be40d0f1f9b90475ef959d9964f24ac makes adblock work again. -- System Information: Debian Release: 6.0 APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.37-05090-g8233525 (SMP w/2 CPU cores; PREEMPT) Locale: LANG=C, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages midori depends on: ii dbus-x11 1.2.24-4 simple interprocess messaging syst ii dpkg 1.15.8.10 Debian package management system ii libc6 2.11.2-10 Embedded GNU C Library: Shared lib ii libcairo2 1.8.10-6 The Cairo 2D vector graphics libra ii libglib2.0-0 2.24.2-1 The GLib library of C routines ii libgtk2.0-0 2.20.1-2 The GTK+ graphical user interface ii libjs-mootools 1.2.5~debian1-2 compact JavaScript framework ii libnotify1 [libnotify1 0.5.0-2 sends desktop notifications to a n ii libpango1.0-0 1.28.3-1+squeeze1 Layout and rendering of internatio ii libsoup2.4-1 2.30.2-1 an HTTP library implementation in ii libsqlite3-0 3.7.4-2 SQLite 3 shared library ii libunique-1.0-0 1.1.6-1.1 Library for writing single instanc ii libwebkit-1.0-2 1.2.6-2 Web content engine library for Gtk ii libx11-6 2:1.3.3-4 X11 client-side library ii libxml2 2.7.8.dfsg-2 GNOME XML library ii libxss1 1:1.2.1-1 X11 Screen Saver extension library Versions of packages midori recommends: ii gnome-icon-theme 2.30.3-2 GNOME Desktop icon theme midori suggests no packages. -- no debconf information
>From 2ec029160c40ce14ab4797527cbdffefbc5e84c0 Mon Sep 17 00:00:00 2001 From: Tino Keitel <[email protected]> Date: Mon, 31 Jan 2011 19:11:44 +0100 Subject: [PATCH] Revert "Never filter the main page itself with adblock" This reverts commit 2e35f1718be40d0f1f9b90475ef959d9964f24ac. This breaks adblock. --- extensions/adblock.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/extensions/adblock.c b/extensions/adblock.c index 6ae7adc..12a68e5 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -752,10 +752,6 @@ adblock_resource_request_starting_cb (WebKitWebView* web_view, const gchar* req_uri; const char *page_uri; - /* Never filter the main page itself */ - if (web_frame == webkit_web_view_get_main_frame (web_view)) - return; - req_uri = webkit_network_request_get_uri (request); if (!req_uri) -- 1.7.2.3
