adblock_deactivate_tabs had the wrong user data

Fixes: https://bugs.launchpad.net/midori/+bug/977981
This commit is contained in:
André Stösel 2012-04-12 23:10:45 +02:00 committed by Christian Dywan
parent ee4fb4f7ef
commit 08d890e20e

View file

@ -1458,8 +1458,6 @@ adblock_deactivate_tabs (MidoriView* view,
GtkWidget* web_view = midori_view_get_web_view (view); GtkWidget* web_view = midori_view_get_web_view (view);
GtkWidget* image = g_object_get_data (G_OBJECT (browser), "status-image"); 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 ( g_signal_handlers_disconnect_by_func (
web_view, adblock_window_object_cleared_cb, 0); web_view, adblock_window_object_cleared_cb, 0);
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
@ -1485,7 +1483,7 @@ adblock_deactivate_cb (MidoriExtension* extension,
app, adblock_app_add_browser_cb, extension); app, adblock_app_add_browser_cb, extension);
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
browser, adblock_add_tab_cb, extension); 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 (); adblock_destroy_db ();
midori_web_settings_remove_style (settings, "adblock-blockcss"); midori_web_settings_remove_style (settings, "adblock-blockcss");