add conf_comp to module whitelist, use right name for comp module in other places

SVN revision: 82541
This commit is contained in:
Mike Blumenkrantz 2013-01-10 10:03:10 +00:00
parent da8302ac86
commit e5e937b2c2
1 changed files with 3 additions and 3 deletions

View File

@ -82,7 +82,7 @@ e_module_all_load(void)
EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em)
{ {
if (!em) continue; if (!em) continue;
if (!e_util_strcasecmp(em->name, "composite")) if (!e_util_strcasecmp(em->name, "comp"))
{ {
e_config->modules = eina_list_remove_list(e_config->modules, l); e_config->modules = eina_list_remove_list(e_config->modules, l);
eina_stringshare_del(em->name); eina_stringshare_del(em->name);
@ -141,7 +141,7 @@ e_module_new(const char *name)
int in_list = 0; int in_list = 0;
if (!name) return NULL; if (!name) return NULL;
if (!e_util_strcasecmp(name, "composite")) if (!e_util_strcasecmp(name, "comp"))
{ {
e_util_dialog_show(_("Module Error"), e_util_dialog_show(_("Module Error"),
_("The composite module cannot be loaded;" _("The composite module cannot be loaded;"
@ -662,9 +662,9 @@ _e_module_whitelist_check(void)
"battery", "battery",
"bluez4", "bluez4",
"clock", "clock",
"comp",
"conf", "conf",
"conf_applications", "conf_applications",
"conf_comp",
"conf_dialogs", "conf_dialogs",
"conf_display", "conf_display",
"conf_edgebindings", "conf_edgebindings",