efreet - look in /usr/local/share/pixmaps too
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Thu, 16 Apr 2020 12:03:45 +0000 (13:03 +0100)
committerJongmin Lee <jm105.lee@samsung.com>
Thu, 16 Apr 2020 21:31:35 +0000 (06:31 +0900)
src/bin/efreet/efreet_icon_cache_create.c
src/bin/efreet/efreetd_cache.c

index 9f3141b..6810ca6 100644 (file)
@@ -164,6 +164,7 @@ cache_fallback_scan(Eina_Hash *icons, Eina_Hash *dirs)
     }
 #endif
 
+    cache_fallback_scan_dir(icons, dirs, "/usr/local/share/pixmaps");
     cache_fallback_scan_dir(icons, dirs, "/usr/share/pixmaps");
 
     return EINA_TRUE;
@@ -217,6 +218,7 @@ check_fallback_changed(Efreet_Cache_Icon_Theme *theme)
     }
 #endif
 
+    if (cache_directory_modified(theme->dirs, "/usr/local/share/pixmaps")) return EINA_TRUE;
     if (cache_directory_modified(theme->dirs, "/usr/share/pixmaps")) return EINA_TRUE;
     return EINA_FALSE;
 }
@@ -912,6 +914,7 @@ main(int argc, char **argv)
     }
 #endif
 
+    cache_theme_scan("/usr/local/share/pixmaps");
     cache_theme_scan("/usr/share/pixmaps");
 
     /* scan icons */
index 4b801a8..2659a8d 100644 (file)
@@ -698,6 +698,7 @@ icon_changes_listen(void)
      }
 #endif
    eina_inarray_flush(stack);
+   icon_changes_listen_recursive(stack, "/usr/local/share/pixmaps", EINA_TRUE);
    icon_changes_listen_recursive(stack, "/usr/share/pixmaps", EINA_TRUE);
    eina_inarray_free(stack);
    eina_strbuf_free(buf);