forked from enlightenment/efl
parent
96be628d43
commit
a812c2b0d3
|
@ -307,7 +307,7 @@ cache_scan(Efreet_Icon_Theme *theme, Eina_Hash *themes, Eina_Hash *icons, Eina_H
|
||||||
inherit = eina_hash_find(icon_themes, name);
|
inherit = eina_hash_find(icon_themes, name);
|
||||||
if (!inherit)
|
if (!inherit)
|
||||||
INF("Theme `%s` not found for `%s`.",
|
INF("Theme `%s` not found for `%s`.",
|
||||||
name, theme->name.internal);
|
name, theme->name.internal);
|
||||||
if (!cache_scan(inherit, themes, icons, dirs, changed)) return EINA_FALSE;
|
if (!cache_scan(inherit, themes, icons, dirs, changed)) return EINA_FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -680,8 +680,8 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
/* init external subsystems */
|
/* init external subsystems */
|
||||||
if (!eina_init()) return -1;
|
if (!eina_init()) return -1;
|
||||||
_efreet_icon_cache_log_dom = eina_log_domain_register
|
_efreet_icon_cache_log_dom =
|
||||||
("efreet_icon_cache", EFREET_DEFAULT_LOG_COLOR);
|
eina_log_domain_register("efreet_icon_cache", EFREET_DEFAULT_LOG_COLOR);
|
||||||
if (_efreet_icon_cache_log_dom < 0)
|
if (_efreet_icon_cache_log_dom < 0)
|
||||||
{
|
{
|
||||||
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_icon_cache.");
|
EINA_LOG_ERR("Efreet: Could not create a log domain for efreet_icon_cache.");
|
||||||
|
@ -696,7 +696,7 @@ main(int argc, char **argv)
|
||||||
for (i = 1; i < argc; i++)
|
for (i = 1; i < argc; i++)
|
||||||
{
|
{
|
||||||
if (!strcmp(argv[i], "-v"))
|
if (!strcmp(argv[i], "-v"))
|
||||||
eina_log_domain_level_set("efreet_icon_cache", EINA_LOG_LEVEL_DBG);
|
eina_log_domain_level_set("efreet_icon_cache", EINA_LOG_LEVEL_DBG);
|
||||||
else if ((!strcmp(argv[i], "-h")) ||
|
else if ((!strcmp(argv[i], "-h")) ||
|
||||||
(!strcmp(argv[i], "-help")) ||
|
(!strcmp(argv[i], "-help")) ||
|
||||||
(!strcmp(argv[i], "--h")) ||
|
(!strcmp(argv[i], "--h")) ||
|
||||||
|
@ -880,9 +880,9 @@ main(int argc, char **argv)
|
||||||
if (cache_scan(&(theme->theme), themes, icons, theme->dirs, &changed))
|
if (cache_scan(&(theme->theme), themes, icons, theme->dirs, &changed))
|
||||||
{
|
{
|
||||||
INF("generated: '%s' %i (%i)",
|
INF("generated: '%s' %i (%i)",
|
||||||
theme->theme.name.internal,
|
theme->theme.name.internal,
|
||||||
changed,
|
changed,
|
||||||
eina_hash_population(icons));
|
eina_hash_population(icons));
|
||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
Eina_Iterator *icons_it;
|
Eina_Iterator *icons_it;
|
||||||
|
@ -1027,6 +1027,7 @@ on_error:
|
||||||
|
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
eet_shutdown();
|
eet_shutdown();
|
||||||
|
eina_log_domain_unregister(_efreet_icon_cache_log_dom);
|
||||||
eina_shutdown();
|
eina_shutdown();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -1263,7 +1263,7 @@ desktop_cache_update_free(void *data, void *ev)
|
||||||
{
|
{
|
||||||
if (tuple->data == NON_EXISTING) continue;
|
if (tuple->data == NON_EXISTING) continue;
|
||||||
ERR("Efreet: %d:%s still in cache on cache close!",
|
ERR("Efreet: %d:%s still in cache on cache close!",
|
||||||
((Efreet_Desktop *)tuple->data)->ref, (char *)tuple->key);
|
((Efreet_Desktop *)tuple->data)->ref, (char *)tuple->key);
|
||||||
dangling++;
|
dangling++;
|
||||||
}
|
}
|
||||||
eina_iterator_free(it);
|
eina_iterator_free(it);
|
||||||
|
|
|
@ -319,8 +319,8 @@ efreet_trash_ls(void)
|
||||||
files = ecore_file_ls(buf);
|
files = ecore_file_ls(buf);
|
||||||
|
|
||||||
if (eina_log_domain_level_check(_efreet_trash_log_dom, EINA_LOG_LEVEL_INFO))
|
if (eina_log_domain_level_check(_efreet_trash_log_dom, EINA_LOG_LEVEL_INFO))
|
||||||
EINA_LIST_FOREACH(files, l, infofile)
|
EINA_LIST_FOREACH(files, l, infofile)
|
||||||
INF("FILE: %s\n", infofile);
|
INF("FILE: %s\n", infofile);
|
||||||
|
|
||||||
return files;
|
return files;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue