Merge lp:~midori/midori/goBackOnThemedIcons into lp:midori

[Cris Dywan]

Revert install Adblock icons as proper icons and move to own icon folder

[Paweł Forysiuk (tuxator)]

review: Approve

=== renamed file 'icons/scalable/adblock-blocked.svg' => 'data/adblock/blocked.svg'
=== renamed file 'icons/scalable/adblock-disabled.svg' => 'data/adblock/disabled.svg'
=== renamed file 'icons/scalable/adblock-enabled.svg' => 'data/adblock/enabled.svg'
=== modified file 'extensions/adblock/widgets.vala'
--- extensions/adblock/widgets.vala	2014-03-19 22:38:23 +0000
+++ extensions/adblock/widgets.vala	2014-04-03 17:07:41 +0000
@@ -41,7 +41,7 @@
             }
 
             public void set_status (string status) {
-                icon.set_from_icon_name ("adblock-%s".printf (status), Gtk.IconSize.MENU);
+                icon.set_from_file (Midori.Paths.get_res_filename ("adblock/%s.png".printf (status)));
             }
         }
 

=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt	2014-03-19 23:03:25 +0000
+++ icons/CMakeLists.txt	2014-04-03 17:07:41 +0000
@@ -1,10 +1,13 @@
-# Copyright (C) 2013-2014 Christian Dywan <[e-mail]>
-
-file(GLOB SIZES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} */)
-list(REMOVE_ITEM SIZES "CMakeLists.txt")
-foreach(SIZE ${SIZES})
-    file(GLOB ICONS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${SIZE}/*)
-    foreach(ICON ${ICONS})
-        install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/icons/${SIZE})
-    endforeach()
+# Copyright (C) 2013 Christian Dywan <[e-mail]>
+
+macro(install_icon name cat size)
+    file(GLOB FILENAME RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${size}/${name}.*")
+    install(FILES ${FILENAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/${cat})
+endmacro()
+
+foreach(SIZE 16x16 22x22 scalable)
+    install_icon(midori apps ${SIZE})
+    install_icon(extension categories ${SIZE})
+    install_icon(internet-news-reader status ${SIZE})
 endforeach()
+

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2014-03-26 21:12:05 +0000
+++ katze/midori-paths.vala	2014-04-03 17:07:41 +0000
@@ -183,17 +183,9 @@
 #endif
             }
 
-            string fallback_icons1 = Path.build_filename (MDATADIR, PACKAGE_NAME, "icons", "scalable");
-            Gtk.IconTheme.get_default ().append_search_path (fallback_icons1);
-#if !HAVE_WIN32
-            string? fallback_icons2 = build_folder ("icons", null, "scalable");
-            if (fallback_icons2 != null)
-                Gtk.IconTheme.get_default ().append_search_path (fallback_icons2);
-#endif
-
             if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) {
-                stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: %s\nicons: %s\n",
-                               config_dir, cache_dir, user_data_dir, tmp_dir, fallback_icons1);
+                stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: %s\n",
+                               config_dir, cache_dir, user_data_dir, tmp_dir);
             }
         }