debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for "tab registration" in adblock

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/977981
This commit is contained in:
André Stösel 2012-04-13 19:26:30 +02:00 committed by Christian Dywan
parent 53b9923108
commit da5f257314
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
extensions/adblock.c
View file

@ -1031,14 +1031,6 @@ static void
adblock_deactivate_cb (MidoriExtension* extension, adblock_deactivate_cb (MidoriExtension* extension,
MidoriBrowser* browser); MidoriBrowser* browser);
static void
adblock_add_tab_foreach_cb (MidoriView* view,
MidoriBrowser* browser,
MidoriExtension* extension)
{
adblock_add_tab_cb (browser, view, extension);
}
static void static void
adblock_app_add_browser_cb (MidoriApp* app, adblock_app_add_browser_cb (MidoriApp* app,
MidoriBrowser* browser, MidoriBrowser* browser,
@ -1046,6 +1038,8 @@ adblock_app_add_browser_cb (MidoriApp* app,
{ {
GtkWidget* statusbar; GtkWidget* statusbar;
GtkWidget* image; GtkWidget* image;
GtkWidget* view;
gint i;
statusbar = katze_object_get_object (browser, "statusbar"); statusbar = katze_object_get_object (browser, "statusbar");
image = NULL; image = NULL;
@ -1055,8 +1049,10 @@ adblock_app_add_browser_cb (MidoriApp* app,
g_object_set_data_full (G_OBJECT (browser), "status-image", image, g_object_set_data_full (G_OBJECT (browser), "status-image", image,
(GDestroyNotify)gtk_widget_destroy); (GDestroyNotify)gtk_widget_destroy);
midori_browser_foreach (browser, i = 0;
(GtkCallback)adblock_add_tab_foreach_cb, extension); while((view = midori_browser_get_nth_tab(browser, i++)))
adblock_add_tab_cb (browser, MIDORI_VIEW (view), extension);
g_signal_connect (browser, "add-tab", g_signal_connect (browser, "add-tab",
G_CALLBACK (adblock_add_tab_cb), extension); G_CALLBACK (adblock_add_tab_cb), extension);
g_signal_connect (browser, "remove-tab", g_signal_connect (browser, "remove-tab",
@ -1514,6 +1510,8 @@ static void
adblock_deactivate_cb (MidoriExtension* extension, adblock_deactivate_cb (MidoriExtension* extension,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
gint i;
GtkWidget* view;
MidoriApp* app = midori_extension_get_app (extension); MidoriApp* app = midori_extension_get_app (extension);
MidoriWebSettings* settings = katze_object_get_object (app, "settings"); MidoriWebSettings* settings = katze_object_get_object (app, "settings");
@ -1527,7 +1525,10 @@ adblock_deactivate_cb (MidoriExtension* extension,
browser, adblock_add_tab_cb, extension); browser, adblock_add_tab_cb, extension);
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
browser, adblock_remove_tab_cb, extension); browser, adblock_remove_tab_cb, extension);
midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, extension);
i = 0;
while((view = midori_browser_get_nth_tab(browser, i++)))
adblock_deactivate_tabs (MIDORI_VIEW (view), browser, extension);
adblock_destroy_db (); adblock_destroy_db ();
midori_web_settings_remove_style (settings, "adblock-blockcss"); midori_web_settings_remove_style (settings, "adblock-blockcss");