From bf9a792ab708d9bd4ab5b148b33752f5777c253c Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 22 Oct 2008 13:53:03 +0000 Subject: [PATCH] Remove Evas list from all E-MODULES. SVN revision: 36977 --- e_mod_config.c | 4 ++-- e_mod_main.c | 26 +++++++++++++------------- e_mod_main.h | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/e_mod_config.c b/e_mod_config.c index c6863aa..dbf1ecd 100644 --- a/e_mod_config.c +++ b/e_mod_config.c @@ -110,7 +110,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_ilist_clear(ol); - Evas_List *l; + Eina_List *l; int count; l = pop->themes; count = 0; @@ -133,7 +133,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf } count++; } - l = evas_list_next(l); + l = eina_list_next(l); } e_widget_ilist_go(ol); e_widget_min_size_set(ol, 155, 250); diff --git a/e_mod_main.c b/e_mod_main.c index 93e0dd9..1f673c2 100644 --- a/e_mod_main.c +++ b/e_mod_main.c @@ -105,7 +105,7 @@ static Population * _population_init(E_Module *m) { Population *pop; - Evas_List *managers, *l, *l2; + Eina_List *managers, *l, *l2; pop = calloc(1, sizeof(Population)); if (!pop) @@ -150,7 +150,7 @@ _population_init(E_Module *m) con = l2->data; //printf("PENGUINS: E_container found: '%s' [x:%d y:%d w:%d h:%d]\n", // con->name, con->x, con->y, con->w, con->h); - pop->cons = evas_list_append(pop->cons, con); + pop->cons = eina_list_append(pop->cons, con); pop->canvas = con->bg_evas; //e_container_shape_change_callback_add(con, _win_shape_change, NULL); /* for (l3 = e_container_shape_list_get(con); l3; l3 = l3->next) @@ -186,7 +186,7 @@ _population_init(E_Module *m) if (name) { //printf("PENGUINS: Theme found: %s (%s)\n", filename, name); - pop->themes = evas_list_append(pop->themes, strdup(buf)); + pop->themes = eina_list_append(pop->themes, strdup(buf)); } } } @@ -221,7 +221,7 @@ _population_free(Population *pop) //printf("PENGUINS: Free TUX :)\n"); tux = pop->penguins->data; evas_object_del(tux->obj); - pop->penguins = evas_list_remove_list(pop->penguins, pop->penguins); + pop->penguins = eina_list_remove_list(pop->penguins, pop->penguins); E_FREE(tux); tux = NULL; } @@ -234,7 +234,7 @@ _population_free(Population *pop) E_FREE(cus->left_program_name); E_FREE(cus->right_program_name); - pop->customs = evas_list_remove_list(pop->customs, pop->customs); + pop->customs = eina_list_remove_list(pop->customs, pop->customs); E_FREE(cus); cus = NULL; } @@ -260,7 +260,7 @@ _population_shutdown(Population *pop) E_Container *con; con = pop->cons->data; - pop->cons = evas_list_remove_list(pop->cons, pop->cons); + pop->cons = eina_list_remove_list(pop->cons, pop->cons); } _population_free(pop); @@ -272,7 +272,7 @@ _population_shutdown(Population *pop) while (pop->themes) { //printf("PENGUINS: Free Theme '%s'\n", (char *)pop->themes->data); - pop->themes = evas_list_remove_list(pop->themes, pop->themes); + pop->themes = eina_list_remove_list(pop->themes, pop->themes); } if (pop->conf->theme) evas_stringshare_del(pop->conf->theme); @@ -351,7 +351,7 @@ _load_custom_action(Population *pop, const char *filename, char *name) snprintf(buf, sizeof(buf), "start_custom_%d_right", pop->custom_num+1); c->right_program_name = strdup(buf); - pop->customs = evas_list_append(pop->customs, c); + pop->customs = eina_list_append(pop->customs, c); pop->custom_num++; return c; @@ -397,7 +397,7 @@ _theme_load(Population *pop) snprintf(buf, sizeof(buf), "Custom_%d", i++); // evas_hash_foreach(pop->actions, hash_fn, NULL); - // Evas_List *l; + // Eina_List *l; // for (l = pop->customs; l; l = l->next ) // { // Custom_Action *c = l->data; @@ -441,7 +441,7 @@ _population_load(Population *pop) tux->pop = pop; - pop->penguins = evas_list_append(pop->penguins, tux); + pop->penguins = eina_list_append(pop->penguins, tux); evas_object_show(o); _reborn(tux); @@ -485,7 +485,7 @@ static int _cb_animator(void *data) { Population *pop; - Evas_List *l; + Eina_List *l; pop = data; for (l = pop->penguins; l; l = l->next) @@ -673,7 +673,7 @@ _cb_animator(void *data) static int _is_inside_any_win(Population *pop, int x, int y, int ret_value) { - Evas_List *l; + Eina_List *l; E_Container *con; con = e_container_current_get(e_manager_current_get()); @@ -925,7 +925,7 @@ _start_custom_at(Penguin *tux, int at_y) //ran=2; //!!!! //printf("START CUSTOM NUM %d RAN %d\n",tux->pop->custom_num, ran); - tux->custom = evas_list_nth(tux->pop->customs, ran); + tux->custom = eina_list_nth(tux->pop->customs, ran); if (!tux->custom) return; diff --git a/e_mod_main.h b/e_mod_main.h index 5f165d6..54e5041 100644 --- a/e_mod_main.h +++ b/e_mod_main.h @@ -35,14 +35,14 @@ struct _Config struct _Population { E_Module *module; - Evas_List *cons; + Eina_List *cons; Evas *canvas; Ecore_Animator *animator; - Evas_List *penguins; + Eina_List *penguins; Evas_Hash *actions; - Evas_List *customs; + Eina_List *customs; int custom_num; - Evas_List *themes; + Eina_List *themes; E_Config_DD *conf_edd; Config *conf;