[Xfce4-commits] <midori:master> adblock_deactivate_tabs had the wrong user data

[Christian Dywan]

Updating branch refs/heads/master
         to 08d890e20e4299976d6fa2ea673d606693771317 (commit)
       from ee4fb4f7ef15dcaaf9eaaabf5abd0eaf1304af92 (commit)

commit 08d890e20e4299976d6fa2ea673d606693771317
Author: André Stösel <andre at stoesel.de>
Date:   Thu Apr 12 23:10:45 2012 +0200

    adblock_deactivate_tabs had the wrong user data
    
    Fixes: https://bugs.launchpad.net/midori/+bug/977981

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

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 0d46d9e..da59e75 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -1459,8 +1459,6 @@ adblock_deactivate_tabs (MidoriView*      view,
     GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image");
 
     g_signal_handlers_disconnect_by_func (
-       browser, adblock_add_tab_cb, extension);
-    g_signal_handlers_disconnect_by_func (
        web_view, adblock_window_object_cleared_cb, 0);
     g_signal_handlers_disconnect_by_func (
        web_view, adblock_populate_popup_cb, extension);
@@ -1485,7 +1483,7 @@ adblock_deactivate_cb (MidoriExtension* extension,
         app, adblock_app_add_browser_cb, extension);
     g_signal_handlers_disconnect_by_func (
         browser, adblock_add_tab_cb, extension);
-    midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, browser);
+    midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, extension);
 
     adblock_destroy_db ();
     midori_web_settings_remove_style (settings, "adblock-blockcss");