Merge lp:~midori/midori/adblockHicolor into lp:midori

[Cris Dywan]

Move adblock icons to hicolor

[Danielle Foré (danrabbit)]

Works here. Don't forget to sudo gtk-update-icon-cache /usr/share/icons/hicolor/

[Cris Dywan (kalikiana)]

Indeed that was it. Works perfectly now!

Please review if it also works for you.

[gue5t gue5t (gue5t)]

Tested with "export GDK_SCALE=2 midori", and it uses double-resolution rasterizations in that case (and behaves right without hidpi as well).

review: Approve

=== modified file 'extensions/adblock/widgets.vala'
--- extensions/adblock/widgets.vala	2015-06-11 22:47:42 +0000
+++ extensions/adblock/widgets.vala	2015-08-09 20:48:55 +0000
@@ -54,8 +54,7 @@
         }
 
         void set_status (string status) {
-            gicon = new GLib.FileIcon (File.new_for_path (
-                Midori.Paths.get_res_filename ("adblock/%s.png".printf (status))));
+            gicon = new GLib.ThemedIcon ("adblock-%s".printf (status));
         }
 
         public void set_state (Adblock.State state) {

=== added directory 'icons/24x24'
=== renamed file 'data/adblock/blocked.svg' => 'icons/24x24/adblock-blocked.svg'
=== renamed file 'data/adblock/disabled.svg' => 'icons/24x24/adblock-disabled.svg'
=== renamed file 'data/adblock/enabled.svg' => 'icons/24x24/adblock-enabled.svg'
=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt	2014-04-03 00:49:01 +0000
+++ icons/CMakeLists.txt	2015-08-09 20:48:55 +0000
@@ -5,9 +5,12 @@
     install(FILES ${FILENAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/${cat})
 endmacro()
 
-foreach(SIZE 16x16 22x22 scalable)
+foreach(SIZE 16x16 22x22 24x24 scalable)
     install_icon(midori apps ${SIZE})
     install_icon(extension categories ${SIZE})
     install_icon(internet-news-reader status ${SIZE})
+    install_icon(adblock-enabled status ${SIZE})
+    install_icon(adblock-blocked status ${SIZE})
+    install_icon(adblock-disabled status ${SIZE})
 endforeach()