From 6885c35886b7b3b546acb3d2fcdbee82cabb0a96 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Thu, 12 May 2011 11:30:26 -0400 Subject: [PATCH] Fix loading of lists from https Fixes: https://bugs.launchpad.net/midori/+bug/699978 --- extensions/adblock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/adblock.c b/extensions/adblock.c index acc74a2f..a6acc3e7 100644 --- a/extensions/adblock.c +++ b/extensions/adblock.c @@ -29,9 +29,9 @@ (__filter && (g_str_has_prefix (__filter, "http") \ || g_str_has_prefix (__filter, "file"))) #define ADBLOCK_FILTER_SET(__filter,__active) \ - filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-' + __filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-' #define ADBLOCK_FILTER_IS_SET(__filter) \ - filter[4] != '-' + (__filter[4] != '-' && __filter[5] != '-') #ifdef G_ENABLE_DEBUG #define adblock_debug(dmsg, darg1, darg2) \ do { if (debug == 1) g_debug (dmsg, darg1, darg2); } while (0) @@ -119,7 +119,7 @@ adblock_get_filename_for_uri (const gchar* uri) gchar* folder; gchar* path; - if (strchr (uri + 4,'-')) + if (!ADBLOCK_FILTER_IS_SET (uri)) return NULL; if (!strncmp (uri, "file", 4)) -- 2.39.5