forked from enlightenment/efl
init util alongside rest of efreet
Used to be separate as util had different requirements than base efreet, and util had high memory usage. No longer the case. SVN revision: 47510
This commit is contained in:
parent
a870815d90
commit
534519db27
|
@ -61,8 +61,13 @@ efreet_init(void)
|
|||
if (!efreet_menu_init())
|
||||
goto shutdown_efreet_desktop;
|
||||
|
||||
if (!efreet_util_init())
|
||||
goto shutdown_efreet_menu;
|
||||
|
||||
return _efreet_init_count;
|
||||
|
||||
shutdown_efreet_menu:
|
||||
efreet_menu_shutdown();
|
||||
shutdown_efreet_desktop:
|
||||
efreet_desktop_shutdown();
|
||||
shutdown_efreet_ini:
|
||||
|
@ -95,6 +100,7 @@ efreet_shutdown(void)
|
|||
if (--_efreet_init_count != 0)
|
||||
return _efreet_init_count;
|
||||
|
||||
efreet_util_shutdown();
|
||||
efreet_menu_shutdown();
|
||||
efreet_desktop_shutdown();
|
||||
efreet_ini_shutdown();
|
||||
|
|
|
@ -189,6 +189,9 @@ void efreet_ini_shutdown(void);
|
|||
int efreet_desktop_init(void);
|
||||
void efreet_desktop_shutdown(void);
|
||||
|
||||
int efreet_util_init(void);
|
||||
int efreet_util_shutdown(void);
|
||||
|
||||
EAPI const char *efreet_home_dir_get(void);
|
||||
|
||||
const char *efreet_lang_get(void);
|
||||
|
|
|
@ -45,7 +45,7 @@ static Ecore_File_Monitor *cache_monitor = NULL;
|
|||
|
||||
static int init = 0;
|
||||
|
||||
EAPI int
|
||||
int
|
||||
efreet_util_init(void)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
@ -74,7 +74,7 @@ log_error:
|
|||
return 0;
|
||||
}
|
||||
|
||||
EAPI int
|
||||
int
|
||||
efreet_util_shutdown(void)
|
||||
{
|
||||
if (--init) return init;
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
#ifndef EFREET_UTILS_H
|
||||
#define EFREET_UTILS_H
|
||||
|
||||
EAPI int efreet_util_init(void);
|
||||
EAPI int efreet_util_shutdown(void);
|
||||
|
||||
EAPI const char *efreet_util_path_to_file_id(const char *path);
|
||||
|
||||
EAPI Eina_List *efreet_util_desktop_mime_list(const char *mime);
|
||||
|
|
Loading…
Reference in New Issue