From 8276cd4561ebf8c69acff18b62c12c896ac4bf3e Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Fri, 1 Apr 2011 12:47:07 +0000 Subject: [PATCH] e-modules/evry-modules: api changes SVN revision: 58257 --- src/e_mod_main.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index d71a237..3eaa89c 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -339,13 +339,7 @@ e_modapi_init(E_Module *m) bindtextdomain(PACKAGE, buf); bind_textdomain_codeset(PACKAGE, "UTF-8"); - evry_module = E_NEW(Evry_Module, 1); - evry_module->init = &_plugins_init; - evry_module->shutdown = &_plugins_shutdown; - EVRY_MODULE_REGISTER(evry_module); - - if ((evry = e_datastore_get("everything_loaded"))) - evry_module->active = _plugins_init(evry); + EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); e_module_delayed_set(m, 1); @@ -355,11 +349,7 @@ e_modapi_init(E_Module *m) EAPI int e_modapi_shutdown(E_Module *m) { - _plugins_shutdown(); - - EVRY_MODULE_UNREGISTER(evry_module); - E_FREE(evry_module); - + EVRY_MODULE_FREE(evry_module); return 1; }