vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

'everything' module CLEANUP! 

SVN revision: 41937
This commit is contained in:
Hannes Janetzek 2009-08-23 05:46:54 +00:00
parent c47ccbb13c
commit d58623c0cb
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/everything/e_mod_main.c
View File

@ -18,7 +18,7 @@ static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_mod_menu_add(void *data, E_Menu *m); static void _e_mod_menu_add(void *data, E_Menu *m);
static E_Int_Menu_Augmentation *maug = NULL; static E_Int_Menu_Augmentation *maug = NULL;
static E_Action *act = NULL; static E_Action *act = NULL;
static Eina_Array *plugins = NULL; static Eina_Array *plugins = NULL;
static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_edd = NULL;
@ -102,7 +102,7 @@ e_modapi_init(E_Module *m)
evry_conf->quick_nav = 1; evry_conf->quick_nav = 1;
evry_conf->conf_subjects = NULL; evry_conf->conf_subjects = NULL;
evry_conf->conf_actions = NULL; evry_conf->conf_actions = NULL;
evry_conf->conf_objects = NULL; evry_conf->conf_objects = NULL;
} }
/* search for plugins */ /* search for plugins */
@ -130,7 +130,7 @@ e_modapi_init(E_Module *m)
e_action_predef_name_set(_("Everything"), _("Show Everything Dialog"), e_action_predef_name_set(_("Everything"), _("Show Everything Dialog"),
"everything", "", NULL, 0); "everything", "", NULL, 0);
maug = e_int_menus_menu_augmentation_add("main/1", _e_mod_menu_add, NULL, NULL, NULL); maug = e_int_menus_menu_augmentation_add("main/1", _e_mod_menu_add, NULL, NULL, NULL);
e_configure_registry_category_add("extensions", 80, _("Extensions"), e_configure_registry_category_add("extensions", 80, _("Extensions"),
@ -152,7 +152,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
evry_shutdown(); evry_shutdown();
/* remove module-supplied menu additions */ /* remove module-supplied menu additions */
if (maug) if (maug)
{ {
@ -186,9 +186,9 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
if (evry_conf->conf_subjects) eina_list_free(evry_conf->conf_subjects); if (evry_conf->conf_subjects) eina_list_free(evry_conf->conf_subjects);
if (evry_conf->conf_actions) eina_list_free(evry_conf->conf_actions); if (evry_conf->conf_actions) eina_list_free(evry_conf->conf_actions);
if (evry_conf->conf_objects) eina_list_free(evry_conf->conf_objects); if (evry_conf->conf_objects) eina_list_free(evry_conf->conf_objects);
E_FREE(evry_conf); E_FREE(evry_conf);
/* Clean EET */ /* Clean EET */
E_CONFIG_DD_FREE(conf_item_edd); E_CONFIG_DD_FREE(conf_item_edd);
E_CONFIG_DD_FREE(conf_edd); E_CONFIG_DD_FREE(conf_edd);
@ -300,7 +300,7 @@ evry_plugin_new(Evry_Plugin *base, const char *name, int type,
p->action = action; p->action = action;
p->config_page = config_page; p->config_page = config_page;
p->config_apply = config_apply; p->config_apply = config_apply;
return p; return p;
} }
@ -317,6 +317,13 @@ evry_plugin_free(Evry_Plugin *p, int free_pointer)
if (p->config) if (p->config)
{ {
if (p->type == type_subject)
evry_conf->conf_subjects = eina_list_remove(evry_conf->conf_subjects, p->config);
else if (p->type == type_action)
evry_conf->conf_actions = eina_list_remove(evry_conf->conf_actions, p->config);
else if (p->type == type_object)
evry_conf->conf_objects = eina_list_remove(evry_conf->conf_objects, p->config);
if (p->config->name) if (p->config->name)
eina_stringshare_del(p->config->name); eina_stringshare_del(p->config->name);
if (p->config->trigger) if (p->config->trigger)
@ -329,7 +336,6 @@ evry_plugin_free(Evry_Plugin *p, int free_pointer)
E_FREE(p); E_FREE(p);
} }
Evry_Action * Evry_Action *
evry_action_new(const char *name, const char *type_in1, const char *type_in2, evry_action_new(const char *name, const char *type_in1, const char *type_in2,
const char *type_out, const char *icon, const char *type_out, const char *icon,
@ -353,7 +359,6 @@ evry_action_new(const char *name, const char *type_in1, const char *type_in2,
return act; return act;
} }
void void
evry_action_free(Evry_Action *act) evry_action_free(Evry_Action *act)
{ {
@ -371,7 +376,7 @@ evry_action_free(Evry_Action *act)
void void
evry_plugin_register(Evry_Plugin *p, int priority) evry_plugin_register(Evry_Plugin *p, int priority)
{ {
Eina_List *l, *confs = NULL; Eina_List *l, *confs = NULL;
Plugin_Config *pc; Plugin_Config *pc;
Eina_Bool found = 0; Eina_Bool found = 0;
@ -383,7 +388,7 @@ evry_plugin_register(Evry_Plugin *p, int priority)
confs = evry_conf->conf_actions; confs = evry_conf->conf_actions;
else if (p->type == type_object) else if (p->type == type_object)
confs = evry_conf->conf_objects; confs = evry_conf->conf_objects;
EINA_LIST_FOREACH(confs, l, pc) EINA_LIST_FOREACH(confs, l, pc)
{ {
if (pc->name && p->name && !strcmp(pc->name, p->name)) if (pc->name && p->name && !strcmp(pc->name, p->name))
@ -418,12 +423,12 @@ evry_plugin_register(Evry_Plugin *p, int priority)
evry_conf->conf_actions = confs; evry_conf->conf_actions = confs;
else if (p->type == type_object) else if (p->type == type_object)
evry_conf->conf_objects = confs; evry_conf->conf_objects = confs;
if (p->type == type_subject) if (p->type == type_subject)
{ {
char buf[256]; char buf[256];
snprintf(buf, sizeof(buf), "Show %s Plugin", p->name); snprintf(buf, sizeof(buf), "Show %s Plugin", p->name);
e_action_predef_name_set(_("Everything"), buf, e_action_predef_name_set(_("Everything"), buf,
"everything", p->name, NULL, 1); "everything", p->name, NULL, 1);
} }