diff options
author | Cedric BAIL <cedric.bail@free.fr> | 2008-10-22 11:49:33 +0000 |
---|---|---|
committer | Cedric BAIL <cedric.bail@free.fr> | 2008-10-22 11:49:33 +0000 |
commit | 1087de2397de995fd84b4c4dc87ea91389945cf2 (patch) | |
tree | b545a9b02799d930773f2d6e485479912fe76eaa /src/modules/gadman | |
parent | b170c9ffe00cb94de1760b3bb9eb207c9c674540 (diff) | |
download | enlightenment-1087de2397de995fd84b4c4dc87ea91389945cf2.tar.gz |
Remove Evas list and replace them with Eina list.
No change for ->next and ->data access right now, as the patch is already
big enough.
SVN revision: 36962
Diffstat (limited to 'src/modules/gadman')
-rw-r--r-- | src/modules/gadman/e_mod_config.c | 10 | ||||
-rw-r--r-- | src/modules/gadman/e_mod_gadman.c | 38 | ||||
-rw-r--r-- | src/modules/gadman/e_mod_gadman.h | 2 |
3 files changed, 25 insertions, 25 deletions
diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c index 8dd5b87d11..d8e96aa97f 100644 --- a/src/modules/gadman/e_mod_config.c +++ b/src/modules/gadman/e_mod_config.c @@ -244,7 +244,7 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda static int _adv_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - Evas_List *sel; + Eina_List *sel; const char *p = NULL; E_Fm2_Icon_Info *ic; char path[PATH_MAX]; @@ -269,7 +269,7 @@ _adv_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) eina_stringshare_del(Man->conf->custom_bg); Man->conf->custom_bg = eina_stringshare_add(path); } - evas_list_free(sel); + eina_list_free(sel); } e_config_save_queue(); @@ -281,7 +281,7 @@ _adv_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) static void _fill_gadgets_list(Evas_Object *ilist) { - Evas_List *l = NULL; + Eina_List *l = NULL; int w; e_widget_ilist_freeze(ilist); @@ -311,7 +311,7 @@ static void _cb_add(void *data, void *data2) { E_Config_Dialog_Data *cfdata; - Evas_List *l = NULL; + Eina_List *l = NULL; int i; if (!(cfdata = data)) return; @@ -332,7 +332,7 @@ _cb_add(void *data, void *data2) gadman_gadget_edit_start(gcc); } - if (l) evas_list_free(l); + if (l) eina_list_free(l); } static void diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index 0817c12d49..e7f313c8cb 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -41,7 +41,7 @@ E_Gadcon_Client *current; void gadman_init(E_Module *m) { - Evas_List *l; + Eina_List *l; /* Create Manager */ Man = calloc(1, sizeof(Manager)); @@ -99,8 +99,8 @@ gadman_shutdown(void) e_gadcon_unpopulate(Man->gc_top); /* free gadcons */ - e_config->gadcons = evas_list_remove(e_config->gadcons, Man->gc); - e_config->gadcons = evas_list_remove(e_config->gadcons, Man->gc_top); + e_config->gadcons = eina_list_remove(e_config->gadcons, Man->gc); + e_config->gadcons = eina_list_remove(e_config->gadcons, Man->gc_top); eina_stringshare_del(Man->gc->name); eina_stringshare_del(Man->gc_top->name); if (Man->gc->config_dialog) e_object_del(E_OBJECT(Man->gc->config_dialog)); @@ -111,7 +111,7 @@ gadman_shutdown(void) /* free manager */ evas_object_del(Man->mover); evas_object_del(Man->mover_top); - evas_list_free(Man->gadgets); + eina_list_free(Man->gadgets); if (Man->top_ee) { e_canvas_del(Man->top_ee); @@ -127,7 +127,7 @@ gadman_gadget_place(E_Config_Gadcon_Client *cf, int ontop) E_Gadcon *gc; E_Gadcon_Client *gcc; E_Gadcon_Client_Class *cc = NULL; - Evas_List *l = NULL; + Eina_List *l = NULL; if (!cf->name) return NULL; @@ -150,7 +150,7 @@ gadman_gadget_place(E_Config_Gadcon_Client *cf, int ontop) gcc->cf = cf; gcc->client_class = cc; - Man->gadgets = evas_list_append(Man->gadgets, gcc); + Man->gadgets = eina_list_append(Man->gadgets, gcc); //printf("Place Gadget %s (style: %s id: %s) (gadcon: %s)\n", gcc->name, cf->style, cf->id, gc->name); @@ -212,12 +212,12 @@ gadman_gadget_add(E_Gadcon_Client_Class *cc, int ontop) void gadman_gadget_remove(E_Gadcon_Client *gcc) { - Man->gadgets = evas_list_remove(Man->gadgets, gcc); + Man->gadgets = eina_list_remove(Man->gadgets, gcc); edje_object_part_unswallow(gcc->o_frame, gcc->o_base); evas_object_del(gcc->o_frame); - gcc->gadcon->clients = evas_list_remove(gcc->gadcon->clients, gcc); + gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc); e_object_del(E_OBJECT(gcc)); current = NULL; @@ -226,13 +226,13 @@ gadman_gadget_remove(E_Gadcon_Client *gcc) void gadman_gadget_del(E_Gadcon_Client *gcc) { - Man->gadgets = evas_list_remove(Man->gadgets, gcc); + Man->gadgets = eina_list_remove(Man->gadgets, gcc); edje_object_part_unswallow(gcc->o_frame, gcc->o_base); evas_object_del(gcc->o_frame); e_gadcon_client_config_del(current->gadcon->cf, gcc->cf); - gcc->gadcon->clients = evas_list_remove(gcc->gadcon->clients, gcc); + gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc); e_object_del(E_OBJECT(gcc)); current = NULL; @@ -275,7 +275,7 @@ gadman_gadget_edit_end(void) void gadman_gadgets_show(void) { - Evas_List *l = NULL; + Eina_List *l = NULL; Man->visible = 1; ecore_evas_show(Man->top_ee); @@ -316,7 +316,7 @@ gadman_gadgets_show(void) void gadman_gadgets_hide(void) { - Evas_List *l = NULL; + Eina_List *l = NULL; Man->visible = 0; @@ -412,7 +412,7 @@ static E_Gadcon* _gadman_gadcon_new(const char* name, int ontop) { E_Gadcon *gc; - Evas_List *l = NULL; + Eina_List *l = NULL; /* Create Gadcon */ gc = E_OBJECT_ALLOC(E_Gadcon, E_GADCON_TYPE, NULL); @@ -503,7 +503,7 @@ _gadman_gadcon_new(const char* name, int ontop) gc->cf->name = eina_stringshare_add(name); gc->cf->id = gc->id; gc->cf->clients = NULL; - e_config->gadcons = evas_list_append(e_config->gadcons, gc->cf); + e_config->gadcons = eina_list_append(e_config->gadcons, gc->cf); e_config_save_queue(); } @@ -742,7 +742,7 @@ _get_bind_text(const char* action) static void on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch) { - Evas_List *l = NULL; + Eina_List *l = NULL; E_Container *con; con = e_container_shape_container_get(es); @@ -818,8 +818,8 @@ on_menu_layer_bg(void *data, E_Menu *m, E_Menu_Item *mi) gadman_gadget_remove(current); current = gadman_gadget_place(cf, 0); - Man->gc_top->cf->clients = evas_list_remove(Man->gc_top->cf->clients, cf); - Man->gc->cf->clients = evas_list_append(Man->gc->cf->clients, cf); + Man->gc_top->cf->clients = eina_list_remove(Man->gc_top->cf->clients, cf); + Man->gc->cf->clients = eina_list_append(Man->gc->cf->clients, cf); e_config_save_queue(); } @@ -835,8 +835,8 @@ on_menu_layer_top(void *data, E_Menu *m, E_Menu_Item *mi) gadman_gadget_remove(current); current = gadman_gadget_place(cf, 1); - Man->gc->cf->clients = evas_list_remove(Man->gc->cf->clients, cf); - Man->gc_top->cf->clients = evas_list_append(Man->gc_top->cf->clients, cf); + Man->gc->cf->clients = eina_list_remove(Man->gc->cf->clients, cf); + Man->gc_top->cf->clients = eina_list_append(Man->gc_top->cf->clients, cf); e_config_save_queue(); diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h index 770dd15eca..36da5e1269 100644 --- a/src/modules/gadman/e_mod_gadman.h +++ b/src/modules/gadman/e_mod_gadman.h @@ -34,7 +34,7 @@ struct _Manager { E_Gadcon *gc; E_Gadcon *gc_top; - Evas_List *gadgets; + Eina_List *gadgets; Evas_Object *mover; Evas_Object *mover_top; Evas_Object *full_bg; |