Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_actions.c e_bindings.c Log Message: Free =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_actions.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_actions.c 5 May 2005 08:33:16 -0000 1.7 +++ e_actions.c 10 May 2005 10:34:19 -0000 1.8 @@ -48,6 +48,7 @@ static void _e_actions_act_##act##_end_key(E_Object *obj, char *params, Ecore_X_Event_Key_Up *ev) /* local subsystem functions */ +static Evas_Bool _e_actions_cb_free(Evas_Hash *hash, const char *key, void *data, void *fdata); /* to save writing this in N places - the sctions are defined here */ /***************************************************************************/ @@ -549,7 +550,12 @@ int e_actions_shutdown(void) { - /* FIXME: free actions */ + if (actions) + { + evas_hash_foreach(actions, _e_actions_cb_free, NULL); + evas_hash_free(actions); + actions = NULL; + } return 1; } @@ -593,3 +599,14 @@ } /* local subsystem functions */ +static Evas_Bool +_e_actions_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, + void *data, void *fdata __UNUSED__) +{ + E_Action *act; + + act = data; + IF_FREE(act->name); + free(act); + return 0; +} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_bindings.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_bindings.c 3 May 2005 15:25:01 -0000 1.10 +++ e_bindings.c 10 May 2005 10:34:19 -0000 1.11 @@ -77,7 +77,28 @@ int e_bindings_shutdown(void) { - /* FIXME: free bindings */ + Evas_List *l; + + for (l = mouse_bindings; l; l = l->next) + { + E_Binding_Mouse *bind; + + bind = l->data; + _e_bindings_mouse_free(bind); + } + evas_list_free(mouse_bindings); + mouse_bindings = NULL; + + for (l = key_bindings; l; l = l->next) + { + E_Binding_Key *bind; + + bind = l->data; + _e_bindings_key_free(bind); + } + evas_list_free(key_bindings); + key_bindings = NULL; + return 1; } ------------------------------------------------------- This SF.Net email is sponsored by Oracle Space Sweepstakes Want to be the first software developer in space? Enter now for the Oracle Space Sweepstakes! http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs