init ecore in main init

SVN revision: 54781
devs/devilhorns/wayland_egl
Sebastian Dransfeld 12 years ago
parent 93429120f9
commit a16314cd88
  1. 6
      legacy/efreet/src/lib/efreet.c
  2. 6
      legacy/efreet/src/lib/efreet_icon.c

@ -34,8 +34,10 @@ efreet_init(void)
if (!eina_init())
return --_efreet_init_count;
if (!eet_init())
if (!ecore_init())
goto shutdown_eina;
if (!eet_init())
goto shutdown_ecore;
_efreet_log_domain_global = eina_log_domain_register("efreet", EFREET_DEFAULT_LOG_COLOR);
if (_efreet_log_domain_global < 0)
{
@ -91,6 +93,8 @@ unregister_log_domain:
eina_log_domain_unregister(_efreet_log_domain_global);
shutdown_eet:
eet_shutdown();
shutdown_ecore:
ecore_shutdown();
shutdown_eina:
eina_shutdown();

@ -118,16 +118,10 @@ efreet_icon_init(void)
const char *default_exts[] = {".png", ".xpm", NULL};
int i;
if (!ecore_init())
return 0;
_efreet_icon_log_dom = eina_log_domain_register
("efreet_icon", EFREET_DEFAULT_LOG_COLOR);
if (_efreet_icon_log_dom < 0)
{
ecore_shutdown();
return 0;
}
/* setup the default extension list */
for (i = 0; default_exts[i]; i++)

Loading…
Cancel
Save