Merge lp:~midori/midori/adblock-buglets into lp:midori

[Paweł Forysiuk]

Small adblock bugfixes

[lp:~midori/midori/adblock-buglets]

6608. By Paweł Forysiuk on 2014-03-19

Properly install generated png files in adblock subfolder

[Cris Dywan (kalikiana)]

Connecting the selector errors to debug:parse is bad, it's next to impossible to see anything within that cloud of dust.

review: Needs Fixing

[lp:~midori/midori/adblock-buglets]

6609. By Paweł Forysiuk on 2014-03-20

Add adblock:css debug token for displaying element hider selectors

[Cris Dywan (kalikiana)]

Thanks!

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-12-01 16:01:31 +0000
+++ data/CMakeLists.txt	2014-03-20 20:14:07 +0000
@@ -30,7 +30,14 @@
         endif ()
     elseif (${FILE} MATCHES "\\.svg$")
         string(REPLACE ".svg" "" IMG_ID ${FILE})
-        SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/")
+        string (FIND ${FILE} "/" IS_DIR)
+        if (IS_DIR GREATER -1)
+            string(REPLACE "/" ";" DIR_LIST ${FILE})
+            LIST(GET DIR_LIST 0 S_DIR)
+            SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/${S_DIR}")
+        else ()
+            SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/")
+        endif()
     # These are being handled in add_executable for the "midori" binary
     elseif (${FILE} MATCHES "\\.ico$")
     elseif (${FILE} MATCHES "\\.rc$")
 
=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2014-03-14 14:36:07 +0000
+++ extensions/adblock/extension.vala	2014-03-20 20:14:07 +0000
@@ -108,7 +108,7 @@
             browser.remove_tab.connect (tab_removed);
 
             var toggle_button = status_icon.add_button ();
-            browser.statusbar.pack_start (toggle_button, false, false, 3);
+            browser.statusbar.pack_end (toggle_button, false, false, 3);
             toggle_button.show ();
         }
 
 
=== modified file 'extensions/adblock/subscriptions.vala'
--- extensions/adblock/subscriptions.vala	2014-03-14 21:28:40 +0000
+++ extensions/adblock/subscriptions.vala	2014-03-20 20:14:07 +0000
@@ -160,7 +160,8 @@
             }
         }
 
-        void update_css_hash (string domain, string value) {
+        bool css_element_seems_valid (string element) {
+            bool is_valid = true;
             string[] valid_elements = { "::after", "::before", "a", "abbr", "address", "article", "aside",
                 "b", "blockquote", "caption", "center", "cite", "code", "div", "dl", "dt", "dd", "em",
                 "feed", "fieldset", "figcaption", "figure", "font", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6",
@@ -168,15 +169,28 @@
                 "m", "main", "marquee", "menu", "nav", "ol", "option", "p", "pre", "q", "samp", "section",
                 "small", "span", "strong", "summary", "table", "tr", "tbody", "td", "th", "thead", "tt", "ul" };
 
-            if (!value.has_prefix (".") && !value.has_prefix ("#")
-             && !(value.split("[")[0] in valid_elements))
-                  message ("Adblock: Invalid selector: %s", value);
-            string? olddata = element.lookup (domain);
-            if (olddata != null) {
-                string newdata = olddata + " , " + value;
-                element.insert (domain, newdata);
-            } else {
-                element.insert (domain, value);
+            if (!element.has_prefix (".") && !element.has_prefix ("#")
+            && !(element.split("[")[0] in valid_elements))
+                is_valid = false;
+
+
+            bool debug_selectors = "adblock:css" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+            if (debug_selectors)
+                stdout.printf ("Adblock '%s' %s: %s\n",
+                    this.title, is_valid ? "selector" : "INVALID?", element);
+
+            return is_valid;
+        }
+
+        void update_css_hash (string domain, string value) {
+            if (css_element_seems_valid (value)) {
+                string? olddata = element.lookup (domain);
+                if (olddata != null) {
+                    string newdata = olddata + " , " + value;
+                    element.insert (domain, newdata);
+                } else {
+                    element.insert (domain, value);
+                }
             }
         }
 
 
=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2014-03-17 02:00:36 +0000
+++ midori/midori-app.c	2014-03-20 20:14:07 +0000
@@ -1254,7 +1254,7 @@
 midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
-    const gchar* debug_tokens = "adblock:match adblock:parse adblock:time adblock:element startup headers body referer cookies paths hsts unarmed db:bookmarks db:history db:tabby mouse app database ";
+    const gchar* debug_tokens = "adblock:match adblock:parse adblock:time adblock:element adblock:css startup headers body referer cookies paths hsts unarmed db:bookmarks db:history db:tabby mouse app database ";
     if (debug_token == NULL)
     {
         gchar* found_token;
 
=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2014-03-05 07:17:45 +0000
+++ midori/midori-tab.vala	2014-03-20 20:14:07 +0000
@@ -128,11 +128,11 @@
         public void inject_stylesheet (string stylesheet) {
 #if !HAVE_WEBKIT2
             var dom = web_view.get_dom_document ();
+            return_if_fail (dom.head != null);
             try {
                 var style = dom.create_element ("style");
                 style.set_attribute ("type", "text/css");
                 style.append_child (dom.create_text_node (stylesheet));
-                return_if_fail (dom.head != null);
                 dom.head.append_child (style);
             }
             catch (Error error) {