← Back to branch summary

~midori/midori/trunk

« back to all changes in this revision

Viewing changes to extensions/adblock.c

  • Committer: André Stösel
  • Date: 2013-09-03 14:45:17 UTC
  • mfrom: (6374 midori)
  • mto: This revision was merged to the branch mainline in revision 6384.
  • Revision ID: andre@stoesel.de-20130903144517-osvcmgeisra7lcrc
merged lp:midori

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/adblock.c
28
28
    __filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-'
29
29
#define ADBLOCK_FILTER_IS_SET(__filter) \
30
30
    (__filter[4] != '-' && __filter[5] != '-')
31
 
#ifdef G_ENABLE_DEBUG
32
31
    #define adblock_debug(dmsg, darg1, darg2) \
33
32
        do { if (midori_debug ("adblock:match")) g_debug (dmsg, darg1, darg2); } while (0)
34
 
#else
35
 
    #define adblock_debug(dmsg, darg1, darg2) /* nothing */
36
 
#endif
37
33
 
38
34
static GHashTable* pattern = NULL;
39
35
static GHashTable* keys = NULL;
877
873
        }
878
874
    }
879
875
 
880
 
    #ifdef G_ENABLE_DEBUG
881
876
    if (midori_debug ("adblock:time"))
882
877
        g_test_timer_start ();
883
 
    #endif
884
878
    if (adblock_is_matched (req_uri, page_uri))
885
879
    {
886
880
        blocked_uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
888
882
        webkit_network_request_set_uri (request, "about:blank");
889
883
        g_object_set_data (G_OBJECT (web_view), "blocked-uris", blocked_uris);
890
884
    }
891
 
    #ifdef G_ENABLE_DEBUG
892
885
    if (midori_debug ("adblock:time"))
893
886
        g_debug ("match: %f%s", g_test_timer_elapsed (), "seconds");
894
 
    #endif
895
 
 
896
887
}
897
888
 
898
889
static void