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

Adblock: use queue to prevent endless update loop

Browse source
This commit is contained in:
Paweł Forysiuk 2012-09-07 19:51:32 +02:00 committed by Christian Dywan
parent 419d4c1ae5
commit 9af985e7e8
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
extensions/adblock.c
View file

@ -42,6 +42,8 @@ static GHashTable* urlcache = NULL;
static GHashTable* blockcssprivate = NULL; static GHashTable* blockcssprivate = NULL;
static GHashTable* navigationwhitelist = NULL; static GHashTable* navigationwhitelist = NULL;
static GString* blockcss = NULL; static GString* blockcss = NULL;
static GList* update_list = NULL;
static gboolean update_done = FALSE;
static void static void
adblock_parse_file (gchar* path); adblock_parse_file (gchar* path);
@ -165,9 +167,26 @@ adblock_download_notify_status_cb (WebKitDownload* download,
GParamSpec* pspec, GParamSpec* pspec,
MidoriExtension* extension) MidoriExtension* extension)
{ {
if (webkit_download_get_status (download) != WEBKIT_DOWNLOAD_STATUS_FINISHED) if (update_done)
return; return;
adblock_reload_rules (extension, FALSE);
if (webkit_download_get_status (download) == WEBKIT_DOWNLOAD_STATUS_FINISHED)
{
GList* li = NULL;
for (li = update_list; li != NULL; li = g_list_next (li))
{
gchar* uri = g_strdup (webkit_download_get_destination_uri (download) + 7);
if (g_strcmp0 (li->data, uri))
update_list = g_list_remove (update_list, li->data);
g_free (uri);
}
}
if (g_list_length (update_list) == 0)
{
adblock_reload_rules (extension, FALSE);
update_done = TRUE;
}
} }
static gchar* static gchar*
@ -236,6 +255,7 @@ adblock_reload_rules (MidoriExtension* extension,
download = webkit_download_new (request); download = webkit_download_new (request);
g_object_unref (request); g_object_unref (request);
webkit_download_set_destination_uri (download, destination); webkit_download_set_destination_uri (download, destination);
update_list = g_list_prepend (update_list, path);
g_free (destination); g_free (destination);
g_signal_connect (download, "notify::status", g_signal_connect (download, "notify::status",
G_CALLBACK (adblock_download_notify_status_cb), extension); G_CALLBACK (adblock_download_notify_status_cb), extension);