E: Use e_util_env_set (more portable). Fix formatting.

SVN revision: 61616
This commit is contained in:
Christopher Michael 2011-07-23 18:10:11 +00:00
parent b623625aad
commit a85cbce2cb
1 changed files with 4 additions and 7 deletions

View File

@ -46,9 +46,7 @@ e_module_shutdown(void)
/* do not use EINA_LIST_FREE! e_object_del modifies list */ /* do not use EINA_LIST_FREE! e_object_del modifies list */
if (x_fatal) if (x_fatal)
{ e_module_save_all();
e_module_save_all();
}
else else
{ {
while (_e_modules) while (_e_modules)
@ -94,9 +92,9 @@ e_module_all_load(void)
if (!em->name) continue; if (!em->name) continue;
setenv("E_MODULE_LOAD", em->name, 1); e_util_env_set("E_MODULE_LOAD", em->name);
snprintf (buf, sizeof(buf), _("Loading Module: %s"), em->name); snprintf (buf, sizeof(buf), _("Loading Module: %s"), em->name);
e_init_status_set(em->name); e_init_status_set(buf);
m = e_module_new(em->name); m = e_module_new(em->name);
if (m) e_module_enable(m); if (m) e_module_enable(m);
@ -140,7 +138,7 @@ e_module_new(const char *name)
m->error = 1; m->error = 1;
goto init_done; goto init_done;
} }
m->handle = dlopen(modpath, RTLD_NOW | RTLD_GLOBAL); m->handle = dlopen(modpath, (RTLD_NOW | RTLD_GLOBAL));
if (!m->handle) if (!m->handle)
{ {
snprintf(body, sizeof(body), snprintf(body, sizeof(body),
@ -573,7 +571,6 @@ _e_module_sort_priority(const void *d1, const void *d2)
return (m2->priority - m1->priority); return (m2->priority - m1->priority);
} }
static void static void
_e_module_event_update_free(void *data __UNUSED__, void *event) _e_module_event_update_free(void *data __UNUSED__, void *event)
{ {