From 58925e023215507e730da075a9d7060c300996cb 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 --- src/bin/e_fm.c | 4 ++-- src/bin/e_fm_main.c | 4 ++-- src/bin/e_fm_op.c | 4 ++-- src/modules/connman/e_iface.c | 4 ++-- src/modules/everything/e_mod_main.c | 4 ++-- src/modules/fileman/e_fwin.c | 4 ++-- src/modules/fileman/e_mod_main.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index de75e2004..78d7c95da 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -685,7 +685,7 @@ e_fm2_init(void) { char path[PATH_MAX]; - eina_stringshare_init(); + eina_init(); ecore_job_init(); _e_storage_volume_edd_init(); e_user_dir_concat_static(path, "fileman/metadata"); @@ -788,7 +788,7 @@ e_fm2_shutdown(void) e_fm2_op_registry_shutdown(); efreet_mime_shutdown(); ecore_job_shutdown(); - eina_stringshare_shutdown(); + eina_shutdown(); return 1; } diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c index ff53664c1..81cc73aad 100644 --- a/src/bin/e_fm_main.c +++ b/src/bin/e_fm_main.c @@ -260,7 +260,7 @@ main(int argc, char **argv) } ecore_init(); - eina_stringshare_init(); + eina_init(); ecore_app_args_set(argc, (const char **)argv); ecore_file_init(); ecore_ipc_init(); @@ -308,7 +308,7 @@ main(int argc, char **argv) ecore_ipc_shutdown(); ecore_file_shutdown(); - eina_stringshare_shutdown(); + eina_shutdown(); ecore_shutdown(); return 0; diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c index 1a63cff0e..1225437ce 100644 --- a/src/bin/e_fm_op.c +++ b/src/bin/e_fm_op.c @@ -128,7 +128,7 @@ main(int argc, char **argv) E_Fm_Op_Type type; ecore_init(); - eina_stringshare_init(); + eina_init(); _e_fm_op_stdin_buffer = malloc(READBUFSIZE); @@ -304,7 +304,7 @@ main(int argc, char **argv) ecore_main_loop_begin(); quit: - eina_stringshare_shutdown(); + eina_shutdown(); ecore_shutdown(); free(_e_fm_op_stdin_buffer); diff --git a/src/modules/connman/e_iface.c b/src/modules/connman/e_iface.c index 00866bd18..b34a85437 100644 --- a/src/modules/connman/e_iface.c +++ b/src/modules/connman/e_iface.c @@ -1303,7 +1303,7 @@ main(int argc, char **argv) } ecore_init(); - eina_stringshare_init(); + eina_init(); ecore_app_args_set(argc, (const char **)argv); e_dbus_init(); evas_init(); @@ -1327,7 +1327,7 @@ main(int argc, char **argv) e_dbus_connection_close(c); evas_shutdown(); e_dbus_shutdown(); - eina_stringshare_shutdown(); + eina_shutdown(); ecore_shutdown(); return 0; diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index fef41679f..51fdf8bb0 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -60,7 +60,7 @@ e_modapi_init(E_Module *m) evry_history_init(); /* search for plugins */ - eina_module_init(); + eina_init(); snprintf(dir, sizeof(dir), "%s/enlightenment/everything_plugins", e_prefix_lib_get()); @@ -131,7 +131,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) eina_array_free(plugins); } - eina_module_shutdown(); + eina_shutdown(); while ((cfd = e_config_dialog_get("E", "_config_everything_dialog"))) e_object_del(E_OBJECT(cfd)); diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index 79430e71b..21377fc13 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -148,7 +148,7 @@ static Eina_List *fwins = NULL; EAPI int e_fwin_init(void) { - eina_stringshare_init(); + eina_init(); return 1; } @@ -161,7 +161,7 @@ e_fwin_shutdown(void) EINA_LIST_FREE(fwins, fwin) e_object_del(E_OBJECT(fwin)); - eina_stringshare_shutdown(); + eina_shutdown(); return 1; } diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index 588c01ac1..bfee19694 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -43,7 +43,7 @@ e_modapi_init(E_Module *m) conf_module = m; - eina_stringshare_init(); + eina_init(); /* Setup Entry in Config Panel */ e_configure_registry_category_add("fileman", 100, _("Files"), @@ -154,7 +154,7 @@ e_modapi_shutdown(E_Module *m) _e_mod_fileman_config_free(); E_CONFIG_DD_FREE(conf_edd); - eina_stringshare_shutdown(); + eina_shutdown(); conf_module = NULL; return 1;