Merge lp:~tuxator/midori/adblock-parentheses into lp:midori

[Paweł Forysiuk]

Escape parentheses in adblock_fixup_regexp

[Cris Dywan (kalikiana)]

The change looks legit. The indentation of the case/ default statements is off, please correct that.

review: Needs Fixing

[lp:~tuxator/midori/adblock-parentheses]

6282. By Paweł Forysiuk on 2013-07-28

Fix indentation

[Cris Dywan (kalikiana)]

Thanks!

review: Approve

=== modified file 'extensions/adblock.c'
--- extensions/adblock.c	2013-06-22 16:01:42 +0000
+++ extensions/adblock.c	2013-07-28 20:21:26 +0000
@@ -1153,6 +1153,12 @@
         case ']':
             g_string_append (str, "\\]");
             break;
+        case '(':
+            g_string_append (str, "\\(");
+            break;
+        case ')':
+            g_string_append (str, "\\)");
+            break;
         default:
             g_string_append_printf (str,"%c", *src);
             break;
@@ -1779,6 +1785,7 @@
     g_assert_cmpstr (adblock_parse_line (".*foo/bar"), ==, "..*foo/bar");
     g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla.blub/");
     g_assert_cmpstr (adblock_parse_line ("bag?r[]=*cpa"), ==, "bag\\?r\\[\\]=.*cpa");
+    g_assert_cmpstr (adblock_parse_line ("(facebookLike,"), ==, "\\(facebookLike,");
     adblock_destroy_db ();
 }