From 992936af2259611053bc1486b560825d9a714614 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sun, 6 Sep 2009 22:23:04 +0000 Subject: [PATCH] Update to match new EINA init/shutdown. SVN revision: 42301 --- legacy/efreet/src/lib/efreet.c | 4 ++-- legacy/efreet/src/lib/efreet_base.c | 10 ++-------- legacy/efreet/src/lib/efreet_desktop.c | 4 ++-- legacy/efreet/src/lib/efreet_ini.c | 4 ++-- legacy/efreet/src/lib/efreet_menu.c | 4 ++-- legacy/efreet/src/lib/efreet_xml.c | 4 ++-- legacy/ethumb/src/bin/ethumbd.c | 4 ++-- legacy/ethumb/src/lib/Ethumb.c | 16 ++++------------ legacy/ethumb/src/lib/client/Ethumb_Client.c | 6 +++--- 9 files changed, 21 insertions(+), 35 deletions(-) diff --git a/legacy/efreet/src/lib/efreet.c b/legacy/efreet/src/lib/efreet.c index df69879f9a..672947c6c2 100644 --- a/legacy/efreet/src/lib/efreet.c +++ b/legacy/efreet/src/lib/efreet.c @@ -29,7 +29,7 @@ EAPI int efreet_init(void) { if (init++) return init; - if (!eina_stringshare_init()) return --init; + if (!eina_init()) return --init; if (!efreet_base_init()) return --init; if (!efreet_xml_init()) return --init; if (!efreet_icon_init()) return --init; @@ -55,7 +55,7 @@ efreet_shutdown(void) efreet_icon_shutdown(); efreet_xml_shutdown(); efreet_base_shutdown(); - eina_stringshare_shutdown(); + eina_shutdown(); IF_FREE(efreet_lang); IF_FREE(efreet_lang_country); diff --git a/legacy/efreet/src/lib/efreet_base.c b/legacy/efreet/src/lib/efreet_base.c index ca89bb3255..4080c8076b 100644 --- a/legacy/efreet/src/lib/efreet_base.c +++ b/legacy/efreet/src/lib/efreet_base.c @@ -35,12 +35,7 @@ static Eina_List *efreet_dirs_get(const char *key, int efreet_base_init(void) { - if (!eina_stringshare_init()) return 0; - if (!eina_list_init()) - { - eina_stringshare_shutdown(); - return 0; - } + if (!eina_init()) return 0; return 1; } @@ -61,8 +56,7 @@ efreet_base_shutdown(void) IF_FREE_LIST(xdg_data_dirs, eina_stringshare_del); IF_FREE_LIST(xdg_config_dirs, eina_stringshare_del); - eina_list_shutdown(); - eina_stringshare_shutdown(); + eina_shutdown(); } /** diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c index 18ebd131a6..e9903f98c5 100644 --- a/legacy/efreet/src/lib/efreet_desktop.c +++ b/legacy/efreet/src/lib/efreet_desktop.c @@ -136,7 +136,7 @@ int efreet_desktop_init(void) { if (init++) return init; - if (!eina_stringshare_init()) return --init; + if (!eina_init()) return --init; if (!ecore_file_init()) return --init; efreet_desktop_cache = eina_hash_string_superfast_new(NULL); @@ -167,7 +167,7 @@ efreet_desktop_shutdown(void) if (--init) return init; ecore_file_shutdown(); - eina_stringshare_shutdown(); + eina_shutdown(); IF_RELEASE(desktop_environment); IF_FREE_HASH(efreet_desktop_cache); diff --git a/legacy/efreet/src/lib/efreet_ini.c b/legacy/efreet/src/lib/efreet_ini.c index 98c224cdd4..21817e19ab 100644 --- a/legacy/efreet/src/lib/efreet_ini.c +++ b/legacy/efreet/src/lib/efreet_ini.c @@ -54,7 +54,7 @@ int efreet_ini_init(void) { if (init++) return init; - if (!eina_stringshare_init()) return --init; + if (!eina_init()) return --init; return init; } @@ -67,7 +67,7 @@ int efreet_ini_shutdown(void) { if (--init) return init; - eina_stringshare_shutdown(); + eina_shutdown(); return init; } diff --git a/legacy/efreet/src/lib/efreet_menu.c b/legacy/efreet/src/lib/efreet_menu.c index 6c62b11569..adcd84b4e1 100644 --- a/legacy/efreet/src/lib/efreet_menu.c +++ b/legacy/efreet/src/lib/efreet_menu.c @@ -450,7 +450,7 @@ efreet_menu_init(void) {NULL, NULL} }; - if (!eina_stringshare_init()) return 0; + if (!eina_init()) return 0; if (!efreet_xml_init()) return 0; efreet_menu_handle_cbs = eina_hash_string_superfast_new(NULL); @@ -571,7 +571,7 @@ efreet_menu_shutdown(void) IF_RELEASE(efreet_tag_menu); efreet_xml_shutdown(); - eina_stringshare_shutdown(); + eina_shutdown(); } /** diff --git a/legacy/efreet/src/lib/efreet_xml.c b/legacy/efreet/src/lib/efreet_xml.c index a70c0aeb1b..14501ecb88 100644 --- a/legacy/efreet/src/lib/efreet_xml.c +++ b/legacy/efreet/src/lib/efreet_xml.c @@ -47,7 +47,7 @@ int efreet_xml_init(void) { if (init++) return init; - if (!eina_stringshare_init()) return --init; + if (!eina_init()) return --init; return init; } @@ -60,7 +60,7 @@ int efreet_xml_shutdown(void) { if (--init) return init; - eina_stringshare_shutdown(); + eina_shutdown(); return init; } diff --git a/legacy/ethumb/src/bin/ethumbd.c b/legacy/ethumb/src/bin/ethumbd.c index 03d5e3fd2a..731337a068 100644 --- a/legacy/ethumb/src/bin/ethumbd.c +++ b/legacy/ethumb/src/bin/ethumbd.c @@ -1761,7 +1761,7 @@ main(int argc, char *argv[]) memset(&ed, 0, sizeof(ed)); ecore_init(); - eina_stringshare_init(); + eina_init(); ethumb_init(); @@ -1830,7 +1830,7 @@ main(int argc, char *argv[]) e_dbus_shutdown(); finish: ethumb_shutdown(); - eina_stringshare_init(); + eina_init(); ecore_shutdown(); return exit_value; } diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c index d8882a3e39..582511b5eb 100644 --- a/legacy/ethumb/src/lib/Ethumb.c +++ b/legacy/ethumb/src/lib/Ethumb.c @@ -140,23 +140,19 @@ ethumb_init(void) if (initcount) return ++initcount; - if (!eina_log_init()) + if (!eina_init()) { - fprintf(stderr, "ERROR: Could not initialize log module.\n"); + fprintf(stderr, "ERROR: Could not initialize eina.\n"); return 0; } _log_dom = eina_log_domain_register("ethumb", EINA_COLOR_GREEN); if (_log_dom < 0) { EINA_LOG_ERR("Could not register log domain: ethumb"); - eina_log_shutdown(); + eina_shutdown(); return 0; } - eina_stringshare_init(); - eina_list_init(); - eina_hash_init(); - eina_module_init(); evas_init(); ecore_init(); ecore_evas_init(); @@ -183,17 +179,13 @@ ethumb_shutdown(void) eina_stringshare_del(_home_thumb_dir); eina_stringshare_del(_thumb_category_normal); eina_stringshare_del(_thumb_category_large); - eina_stringshare_shutdown(); - eina_list_shutdown(); - eina_hash_shutdown(); - eina_module_shutdown(); evas_shutdown(); ecore_shutdown(); ecore_evas_shutdown(); edje_shutdown(); eina_log_domain_unregister(_log_dom); _log_dom = -1; - eina_log_shutdown(); + eina_shutdown(); } return initcount; diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.c b/legacy/ethumb/src/lib/client/Ethumb_Client.c index cd01c9c6c8..93fa8e77aa 100644 --- a/legacy/ethumb/src/lib/client/Ethumb_Client.c +++ b/legacy/ethumb/src/lib/client/Ethumb_Client.c @@ -400,7 +400,7 @@ ethumb_client_init(void) if (_initcount) return ++_initcount; - if (!eina_log_init()) + if (!eina_init()) { fprintf(stderr, "ERROR: Could not initialize log module.\n"); return 0; @@ -409,7 +409,7 @@ ethumb_client_init(void) if (_log_dom < 0) { EINA_LOG_ERR("Could not register log domain: ethumb_client"); - eina_log_shutdown(); + eina_shutdown(); return 0; } @@ -430,7 +430,7 @@ ethumb_client_shutdown(void) ethumb_shutdown(); eina_log_domain_unregister(_log_dom); _log_dom = -1; - eina_log_shutdown(); + eina_shutdown(); return _initcount; }