Merge lp:~midori/midori/trailingCommas into lp:midori

[Cris Dywan]

Don't use trailing comma on last list element in Adblock tests

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2014-02-20 18:27:01 +0000
+++ extensions/adblock/extension.vala	2014-02-21 17:24:14 +0000
@@ -422,7 +422,7 @@
     { ".*foo/bar", "..*foo/bar" },
     { "http://bla.blub/*", "http://bla.blub/.*" },
     { "bag?r[]=*cpa", "bag\\?r\\[\\]=.*cpa" },
-    { "(facebookLike,", "(facebookLike," },
+    { "(facebookLike,", "(facebookLike," }
 };
 
 void test_adblock_fixup_regexp () {
@@ -457,7 +457,7 @@
     { "https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&query_based_on=gtkport&field0-0-0=keywords&type0-0-0=anywordssubstr&value0-0-0=Gtk%20Cairo%20soup&field0-0-1=short_desc&type0-0-1=anywordssubstr&value0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotool&field0-0-2=component&type0-0-2=equals&value0-0-2=WebKit%20Gtk", Adblock.Directive.ALLOW },
     { "http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/", Adblock.Directive.ALLOW },
     { "http://karibik-invest.com/es/bienes_raices/search.php?sqT=19&sqN=&sqMp=&sqL=0&qR=1&sqMb=&searchMode=1&action=B%FAsqueda", Adblock.Directive.ALLOW },
-    { "http://google.com", Adblock.Directive.ALLOW },
+    { "http://google.com", Adblock.Directive.ALLOW }
 };
 
 string pretty_directive (Adblock.Directive? directive) {
@@ -503,7 +503,7 @@
         { "[Adblock]\n! dutchblock v3\n! This list expires after 14 days\n|http://b*.mookie1.com/\n", false },
         { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n! Expires: 5 days (update frequency)\n", true },
         { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n", true },
-        { "[Adblock]\n ! dummy,  i dont have any dates\n", false },
+        { "[Adblock]\n ! dummy,  i dont have any dates\n", false }
     };
 
 void test_subscription_update () {