forked from enlightenment/efl
Set EFREET_MODULE_LOG_DOM to -1 after unregister
SVN revision: 56731
This commit is contained in:
parent
18c663b7e2
commit
accd246c72
|
@ -36,3 +36,4 @@
|
|||
before including efreet_private.h
|
||||
* Remove efreet_xml_{init,shutdown}() from efreet_menu.c, it is done
|
||||
in efreet_init()
|
||||
* Set EFREET_MODULE_LOG_DOM variable to -1 after unregister
|
||||
|
|
|
@ -90,6 +90,7 @@ efreet_base_shutdown(void)
|
|||
IF_RELEASE(hostname);
|
||||
|
||||
eina_log_domain_unregister(_efreet_base_log_dom);
|
||||
_efreet_base_log_dom = -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -185,6 +185,7 @@ efreet_cache_shutdown(void)
|
|||
}
|
||||
|
||||
eina_log_domain_unregister(_efreet_cache_log_dom);
|
||||
_efreet_cache_log_dom = -1;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -177,6 +177,7 @@ efreet_desktop_shutdown(void)
|
|||
evil_sockets_shutdown();
|
||||
#endif
|
||||
eina_log_domain_unregister(_efreet_desktop_log_dom);
|
||||
_efreet_desktop_log_dom = -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -121,6 +121,7 @@ efreet_icon_shutdown(void)
|
|||
efreet_extra_icon_dirs = eina_list_free(efreet_extra_icon_dirs);
|
||||
|
||||
eina_log_domain_unregister(_efreet_icon_log_dom);
|
||||
_efreet_icon_log_dom = -1;
|
||||
IF_FREE_HASH(change_monitors);
|
||||
}
|
||||
|
||||
|
|
|
@ -71,6 +71,7 @@ void
|
|||
efreet_ini_shutdown(void)
|
||||
{
|
||||
eina_log_domain_unregister(_efreet_ini_log_dom);
|
||||
_efreet_ini_log_dom = -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -487,6 +487,7 @@ efreet_menu_init(void)
|
|||
|| !efreet_menu_move_cbs || !efreet_menu_layout_cbs)
|
||||
{
|
||||
eina_log_domain_unregister(_efreet_menu_log_dom);
|
||||
_efreet_menu_log_dom = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -600,6 +601,7 @@ efreet_menu_shutdown(void)
|
|||
|
||||
efreet_xml_shutdown();
|
||||
eina_log_domain_unregister(_efreet_menu_log_dom);
|
||||
_efreet_menu_log_dom = -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -241,6 +241,7 @@ efreet_mime_init(void)
|
|||
|
||||
unregister_log_domain:
|
||||
eina_log_domain_unregister(_efreet_mime_log_dom);
|
||||
_efreet_mime_log_dom = -1;
|
||||
shutdown_efreet:
|
||||
efreet_shutdown();
|
||||
shutdown_ecore_file:
|
||||
|
@ -280,6 +281,7 @@ efreet_mime_shutdown(void)
|
|||
IF_FREE_HASH(wild);
|
||||
IF_FREE_HASH(mime_icons);
|
||||
eina_log_domain_unregister(_efreet_mime_log_dom);
|
||||
_efreet_mime_log_dom = -1;
|
||||
efreet_shutdown();
|
||||
ecore_file_shutdown();
|
||||
ecore_shutdown();
|
||||
|
|
|
@ -113,6 +113,7 @@
|
|||
#endif
|
||||
#define WRN(...) EINA_LOG_DOM_WARN(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
|
||||
|
||||
/* TODO: Move these to cache, make static and add accessor */
|
||||
extern Eina_Hash *efreet_desktop_cache;
|
||||
extern Eina_Hash *efreet_icon_themes;
|
||||
|
||||
|
|
|
@ -64,6 +64,7 @@ efreet_trash_shutdown(void)
|
|||
|
||||
IF_RELEASE(efreet_trash_dir);
|
||||
eina_log_domain_unregister(_efreet_trash_log_dom);
|
||||
_efreet_trash_log_dom = -1;
|
||||
eina_shutdown();
|
||||
|
||||
return _efreet_trash_init_count;
|
||||
|
|
|
@ -90,6 +90,7 @@ efreet_util_shutdown(void)
|
|||
if (--init) return init;
|
||||
|
||||
eina_log_domain_unregister(_efreet_utils_log_dom);
|
||||
_efreet_utils_log_dom = -1;
|
||||
IF_FREE_HASH(file_id_by_desktop_path);
|
||||
|
||||
IF_RELEASE(cache_names_key);
|
||||
|
|
|
@ -73,6 +73,7 @@ efreet_xml_shutdown(void)
|
|||
_efreet_xml_init_count--;
|
||||
if (_efreet_xml_init_count > 0) return;
|
||||
eina_log_domain_unregister(_efreet_xml_log_dom);
|
||||
_efreet_xml_log_dom = -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue