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

Fix a handful of minor leaks 

Should e_module_find and e_module_new take a const char * instead?


SVN revision: 20292
This commit is contained in:
e-taro 2006-02-05 11:25:01 +00:00 committed by e-taro
parent 57786e3b36
commit 7ac6b0b2af
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/bin/e_int_config_modules.c
View File

@ -74,11 +74,11 @@ _module_configure(void *data, void *data2)
{ {
Evas_Object *obj; Evas_Object *obj;
E_Module *m; E_Module *m;
char *v; const char *v;
obj = data; obj = data;
v = strdup(e_widget_ilist_selected_label_get(obj)); v = e_widget_ilist_selected_label_get(obj);
m = e_module_find(v); m = e_module_find((char *)v);
if (m) if (m)
{ {
if (m->func.config) if (m->func.config)
@ -91,11 +91,11 @@ _module_about(void *data, void *data2)
{ {
Evas_Object *obj; Evas_Object *obj;
E_Module *m; E_Module *m;
char *v; const char *v;
obj = data; obj = data;
v = strdup(e_widget_ilist_selected_label_get(obj)); v = e_widget_ilist_selected_label_get(obj);
m = e_module_find(v); m = e_module_find((char *)v);
if (m) if (m)
{ {
if (m->func.about) if (m->func.about)
@ -137,6 +137,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->modules = evas_list_append(cfdata->modules, m); cfdata->modules = evas_list_append(cfdata->modules, m);
} }
} }
ecore_list_destroy(dirs);
} }
} }
} }
@ -146,7 +147,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
/* Free Lists */ /* Free Lists */
if (l) evas_list_free(l); if (l) evas_list_free(l);
if (dirs != NULL) ecore_list_destroy(dirs);
return; return;
} }
@ -168,7 +168,18 @@ _create_data(E_Config_Dialog *cfd)
static void static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
/* Free the cfdata */ Evas_List *l;
while (l = cfdata->modules)
{
CFModule *m;
m = l->data;
cfdata->modules = evas_list_remove_list(cfdata->modules, l);
free(m->name);
free(m->path);
E_FREE(m);
}
free(cfdata); free(cfdata);
} }
@ -177,10 +188,10 @@ static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
E_Module *m; E_Module *m;
char *v; const char *v;
int i; int i;
v = strdup(e_widget_ilist_selected_label_get(cfdata->gui.list)); v = e_widget_ilist_selected_label_get(cfdata->gui.list);
for (i = 0; i < evas_list_count(cfdata->modules); i++) for (i = 0; i < evas_list_count(cfdata->modules); i++)
{ {
CFModule *cm; CFModule *cm;
@ -193,10 +204,10 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_widget_disabled_set(cfdata->gui.configure, 1); e_widget_disabled_set(cfdata->gui.configure, 1);
e_widget_disabled_set(cfdata->gui.about, 1); e_widget_disabled_set(cfdata->gui.about, 1);
m = e_module_find(v); m = e_module_find((char *)v);
if (!m) if (!m)
{ {
m = e_module_new(v); m = e_module_new((char *)v);
if (!m) break; if (!m) break;
} }
switch (cfdata->state) switch (cfdata->state)
@ -328,12 +339,12 @@ _ilist_cb_change(void *data, Evas_Object *obj)
E_Module *m; E_Module *m;
E_Widget_Data *wd; E_Widget_Data *wd;
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
char *v; const char *v;
int i; int i;
cfdata = data; cfdata = data;
v = strdup(e_widget_ilist_selected_label_get(obj)); v = e_widget_ilist_selected_label_get(obj);
for (i = 0; i < evas_list_count(cfdata->modules); i++) for (i = 0; i < evas_list_count(cfdata->modules); i++)
{ {
CFModule *cm; CFModule *cm;
@ -371,7 +382,7 @@ _ilist_cb_change(void *data, Evas_Object *obj)
} }
e_widget_disabled_set(cfdata->gui.about, 1); e_widget_disabled_set(cfdata->gui.about, 1);
e_widget_disabled_set(cfdata->gui.configure, 1); e_widget_disabled_set(cfdata->gui.configure, 1);
m = e_module_find(v); m = e_module_find((char *)v);
if (m) if (m)
{ {
if (m->func.about) if (m->func.about)