Fix loading of lists from https

Fixes: https://bugs.launchpad.net/midori/+bug/699978

diff --git a/extensions/adblock.c b/extensions/adblock.c
index acc74a2febfa3f4714e085d147f599a8aa5d039c..a6acc3e77d15ed31ec0f560d2f62033e58455125 100644 (file)
--- 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))