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

Fix handling of blockss in Adblock

Browse source
This commit is contained in:
Alexander Butenko 2011-11-09 21:41:54 +01:00 committed by Christian Dywan
parent bcb0fa2569
commit 179e33d054
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
extensions/adblock.c
View file

@ -63,12 +63,13 @@ adblock_build_js (const gchar* private)
" return;" " return;"
" var URL = location.href;" " var URL = location.href;"
" var sites = new Array(); %s;" " var sites = new Array(); %s;"
" var public = '';" " var public = '.madblockplaceholder ';"
" for (var i in sites) {" " for (var i in sites) {"
" if (URL.indexOf(i) != -1 && sites[i] ){" " if (URL.indexOf(i) != -1 && sites[i] ){"
" public += ', .'+sites[i];" " public += ', .'+sites[i];"
" break;" " break;"
" }}" " }}"
" public += ' {display: none !important}';"
" var mystyle = document.createElement('style');" " var mystyle = document.createElement('style');"
" mystyle.setAttribute('type', 'text/css');" " mystyle.setAttribute('type', 'text/css');"
" mystyle.setAttribute('id', 'madblock');" " mystyle.setAttribute('id', 'madblock');"
@ -112,6 +113,8 @@ adblock_download_notify_status_cb (WebKitDownload* download,
MidoriExtension* extension) MidoriExtension* extension)
{ {
gchar* path; gchar* path;
MidoriApp* app;
MidoriWebSettings* settings;
if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_FINISHED) if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_FINISHED)
return; return;
@ -120,8 +123,9 @@ adblock_download_notify_status_cb (WebKitDownload* download,
adblock_parse_file (path); adblock_parse_file (path);
g_free (path); g_free (path);
MidoriApp* app = midori_extension_get_app (extension); app = midori_extension_get_app (extension);
MidoriWebSettings* settings = katze_object_get_object (app, "settings"); settings = katze_object_get_object (app, "settings");
g_string_append (blockcss, " {display: none !important}\n");
midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str); midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str);
katze_assign (blockscript, adblock_build_js (blockcssprivate->str)); katze_assign (blockscript, adblock_build_js (blockcssprivate->str));
g_object_unref (settings); g_object_unref (settings);
@ -160,6 +164,8 @@ adblock_reload_rules (MidoriExtension* extension,
gchar* custom_list; gchar* custom_list;
gchar** filters; gchar** filters;
guint i = 0; guint i = 0;
MidoriApp* app = midori_extension_get_app (extension);
MidoriWebSettings* settings = katze_object_get_object (app, "settings");
adblock_init_db (); adblock_init_db ();
@ -200,9 +206,8 @@ adblock_reload_rules (MidoriExtension* extension,
} }
} }
g_strfreev (filters); g_strfreev (filters);
g_string_append (blockcss, " {display: none !important}\n");
MidoriApp* app = midori_extension_get_app (extension);
MidoriWebSettings* settings = katze_object_get_object (app, "settings");
katze_assign (blockscript, adblock_build_js (blockcssprivate->str)); katze_assign (blockscript, adblock_build_js (blockcssprivate->str));
midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str); midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str);
g_object_unref (settings); g_object_unref (settings);
@ -1303,7 +1308,6 @@ adblock_parse_file (gchar* path)
{ {
while (fgets (line, 2000, file)) while (fgets (line, 2000, file))
adblock_parse_line (line); adblock_parse_line (line);
g_string_append (blockcss, "{display: none !important}\n");
fclose (file); fclose (file);
return TRUE; return TRUE;
} }
@ -1335,6 +1339,7 @@ adblock_deactivate_cb (MidoriExtension* extension,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
MidoriApp* app = midori_extension_get_app (extension); MidoriApp* app = midori_extension_get_app (extension);
MidoriWebSettings* settings = katze_object_get_object (app, "settings");
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
browser, adblock_open_preferences_cb, extension); browser, adblock_open_preferences_cb, extension);
@ -1350,10 +1355,13 @@ adblock_deactivate_cb (MidoriExtension* extension,
g_string_free (blockcss, TRUE); g_string_free (blockcss, TRUE);
if (blockcssprivate) if (blockcssprivate)
g_string_free (blockcssprivate, TRUE); g_string_free (blockcssprivate, TRUE);
midori_web_settings_remove_style (settings, "adblock-blockcss");
blockcssprivate = blockcss = NULL; blockcssprivate = blockcss = NULL;
g_hash_table_destroy (pattern); g_hash_table_destroy (pattern);
g_hash_table_destroy (optslist); g_hash_table_destroy (optslist);
g_hash_table_destroy (urlcache); g_hash_table_destroy (urlcache);
g_object_unref (settings);
} }
static void static void