[Xfce4-commits] <midori:master> Don't do pattern matching if link was matched by key

[Christian Dywan]

Updating branch refs/heads/master
         to ac78646f83215048566236e14e0a97c21d5b302d (commit)
       from 3db46d229710a253463af8881fe86685352fd8ea (commit)

commit ac78646f83215048566236e14e0a97c21d5b302d
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Sat Jul 2 14:19:16 2011 -0400

    Don't do pattern matching if link was matched by key

 extensions/adblock.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 7eb1704..dcde78d 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -678,8 +678,6 @@ static gboolean
 adblock_is_matched (const gchar*  req_uri,
                     const gchar*  page_uri)
 {
-    gboolean foundbykey;
-    gboolean foundbypattern;
     gchar* value;
 
     if ((value = g_hash_table_lookup (urlcache, req_uri)))
@@ -690,9 +688,13 @@ adblock_is_matched (const gchar*  req_uri,
             return TRUE;
     }
 
-    foundbykey = adblock_is_matched_by_key (req_uri, page_uri);
-    foundbypattern = adblock_is_matched_by_pattern (req_uri, page_uri);
-    if (foundbykey == TRUE || foundbypattern == TRUE)
+    if (adblock_is_matched_by_key (req_uri, page_uri))
+    {
+        g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
+        return TRUE;
+    }
+
+    if (adblock_is_matched_by_pattern (req_uri, page_uri))
     {
         g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
         return TRUE;