Update to match new EINA init/shutdown.
SVN revision: 42301
This commit is contained in:
parent
bdec662049
commit
58925e0232
|
@ -685,7 +685,7 @@ e_fm2_init(void)
|
||||||
{
|
{
|
||||||
char path[PATH_MAX];
|
char path[PATH_MAX];
|
||||||
|
|
||||||
eina_stringshare_init();
|
eina_init();
|
||||||
ecore_job_init();
|
ecore_job_init();
|
||||||
_e_storage_volume_edd_init();
|
_e_storage_volume_edd_init();
|
||||||
e_user_dir_concat_static(path, "fileman/metadata");
|
e_user_dir_concat_static(path, "fileman/metadata");
|
||||||
|
@ -788,7 +788,7 @@ e_fm2_shutdown(void)
|
||||||
e_fm2_op_registry_shutdown();
|
e_fm2_op_registry_shutdown();
|
||||||
efreet_mime_shutdown();
|
efreet_mime_shutdown();
|
||||||
ecore_job_shutdown();
|
ecore_job_shutdown();
|
||||||
eina_stringshare_shutdown();
|
eina_shutdown();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -260,7 +260,7 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
ecore_init();
|
ecore_init();
|
||||||
eina_stringshare_init();
|
eina_init();
|
||||||
ecore_app_args_set(argc, (const char **)argv);
|
ecore_app_args_set(argc, (const char **)argv);
|
||||||
ecore_file_init();
|
ecore_file_init();
|
||||||
ecore_ipc_init();
|
ecore_ipc_init();
|
||||||
|
@ -308,7 +308,7 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
ecore_ipc_shutdown();
|
ecore_ipc_shutdown();
|
||||||
ecore_file_shutdown();
|
ecore_file_shutdown();
|
||||||
eina_stringshare_shutdown();
|
eina_shutdown();
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -128,7 +128,7 @@ main(int argc, char **argv)
|
||||||
E_Fm_Op_Type type;
|
E_Fm_Op_Type type;
|
||||||
|
|
||||||
ecore_init();
|
ecore_init();
|
||||||
eina_stringshare_init();
|
eina_init();
|
||||||
|
|
||||||
_e_fm_op_stdin_buffer = malloc(READBUFSIZE);
|
_e_fm_op_stdin_buffer = malloc(READBUFSIZE);
|
||||||
|
|
||||||
|
@ -304,7 +304,7 @@ main(int argc, char **argv)
|
||||||
ecore_main_loop_begin();
|
ecore_main_loop_begin();
|
||||||
|
|
||||||
quit:
|
quit:
|
||||||
eina_stringshare_shutdown();
|
eina_shutdown();
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
|
|
||||||
free(_e_fm_op_stdin_buffer);
|
free(_e_fm_op_stdin_buffer);
|
||||||
|
|
|
@ -1303,7 +1303,7 @@ main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
ecore_init();
|
ecore_init();
|
||||||
eina_stringshare_init();
|
eina_init();
|
||||||
ecore_app_args_set(argc, (const char **)argv);
|
ecore_app_args_set(argc, (const char **)argv);
|
||||||
e_dbus_init();
|
e_dbus_init();
|
||||||
evas_init();
|
evas_init();
|
||||||
|
@ -1327,7 +1327,7 @@ main(int argc, char **argv)
|
||||||
e_dbus_connection_close(c);
|
e_dbus_connection_close(c);
|
||||||
evas_shutdown();
|
evas_shutdown();
|
||||||
e_dbus_shutdown();
|
e_dbus_shutdown();
|
||||||
eina_stringshare_shutdown();
|
eina_shutdown();
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -60,7 +60,7 @@ e_modapi_init(E_Module *m)
|
||||||
evry_history_init();
|
evry_history_init();
|
||||||
|
|
||||||
/* search for plugins */
|
/* search for plugins */
|
||||||
eina_module_init();
|
eina_init();
|
||||||
|
|
||||||
snprintf(dir, sizeof(dir), "%s/enlightenment/everything_plugins",
|
snprintf(dir, sizeof(dir), "%s/enlightenment/everything_plugins",
|
||||||
e_prefix_lib_get());
|
e_prefix_lib_get());
|
||||||
|
@ -131,7 +131,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
||||||
eina_array_free(plugins);
|
eina_array_free(plugins);
|
||||||
}
|
}
|
||||||
|
|
||||||
eina_module_shutdown();
|
eina_shutdown();
|
||||||
|
|
||||||
while ((cfd = e_config_dialog_get("E", "_config_everything_dialog")))
|
while ((cfd = e_config_dialog_get("E", "_config_everything_dialog")))
|
||||||
e_object_del(E_OBJECT(cfd));
|
e_object_del(E_OBJECT(cfd));
|
||||||
|
|
|
@ -148,7 +148,7 @@ static Eina_List *fwins = NULL;
|
||||||
EAPI int
|
EAPI int
|
||||||
e_fwin_init(void)
|
e_fwin_init(void)
|
||||||
{
|
{
|
||||||
eina_stringshare_init();
|
eina_init();
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,7 @@ e_fwin_shutdown(void)
|
||||||
EINA_LIST_FREE(fwins, fwin)
|
EINA_LIST_FREE(fwins, fwin)
|
||||||
e_object_del(E_OBJECT(fwin));
|
e_object_del(E_OBJECT(fwin));
|
||||||
|
|
||||||
eina_stringshare_shutdown();
|
eina_shutdown();
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ e_modapi_init(E_Module *m)
|
||||||
|
|
||||||
conf_module = m;
|
conf_module = m;
|
||||||
|
|
||||||
eina_stringshare_init();
|
eina_init();
|
||||||
|
|
||||||
/* Setup Entry in Config Panel */
|
/* Setup Entry in Config Panel */
|
||||||
e_configure_registry_category_add("fileman", 100, _("Files"),
|
e_configure_registry_category_add("fileman", 100, _("Files"),
|
||||||
|
@ -154,7 +154,7 @@ e_modapi_shutdown(E_Module *m)
|
||||||
_e_mod_fileman_config_free();
|
_e_mod_fileman_config_free();
|
||||||
E_CONFIG_DD_FREE(conf_edd);
|
E_CONFIG_DD_FREE(conf_edd);
|
||||||
|
|
||||||
eina_stringshare_shutdown();
|
eina_shutdown();
|
||||||
|
|
||||||
conf_module = NULL;
|
conf_module = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in New Issue