Merge lp:~gue5t/midori/builtInIcons2 into lp:~midori/midori/builtInIcons

[gue5t gue5t]

simplify path handing and make a symlink at build-time to show adblock icons without install

I think this fulfills the required directory layout. Hopefully it's okay to invoke `ln`; as far as I could tell CMake doesn't have a built-in symlink command, but this works on any POSIX system (and isn't run on Windows).

=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt	2015-08-09 20:44:57 +0000
+++ icons/CMakeLists.txt	2015-08-24 01:04:00 +0000
@@ -1,5 +1,9 @@
 # Copyright (C) 2013 Christian Dywan <[e-mail]>
 
+if (UNIX)
+    EXECUTE_PROCESS(COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/hicolor)
+endif ()
+
 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})
 
=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2015-08-16 17:27:46 +0000
+++ katze/midori-paths.vala	2015-08-24 01:04:00 +0000
@@ -185,8 +185,7 @@
             }
 
             #if !HAVE_WIN32
-            string builtin_path = build_folder ("icons", null, "index.theme", true);
-            Gtk.IconTheme.get_default ().append_search_path (builtin_path);
+            Gtk.IconTheme.get_default ().append_search_path (exec_path);
             #endif
 
             if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) {
@@ -392,7 +391,7 @@
         }
 
         #if !HAVE_WIN32
-        string? build_folder (string folder, string? middle, string filename, bool folder_only=false) {
+        string? build_folder (string folder, string? middle, string filename) {
             /* Fallback to build folder */
             File? parent = File.new_for_path (exec_path);
             while (parent != null) {
@@ -400,8 +399,6 @@
                 if (middle != null)
                     data = data.get_child (middle);
                 var child = data.get_child (filename);
-                if (folder_only && child.query_exists ())
-                    return data.get_path ();
                 if (child.query_exists ())
                     return child.get_path ();
                 parent = parent.get_parent ();