From: Enlightenment C. <no...@cv...> - 2006-06-06 14:41:51
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c mem.edc module.eap Log Message: Changed image to old mem.png (scales better). Modified eap for new image. Removed mouse_events from edc. Delete evas_callbacks when shutdown. =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- e_mod_main.c 6 Jun 2006 08:43:00 -0000 1.28 +++ e_mod_main.c 6 Jun 2006 14:39:40 -0000 1.29 @@ -74,6 +74,7 @@ inst->mem_obj = o; evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _mem_cb_mouse_down, inst); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _mem_cb_mouse_in, inst); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, _mem_cb_mouse_in, inst); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _mem_cb_mouse_out, inst); @@ -116,11 +117,20 @@ _gc_shutdown(E_Gadcon_Client *gcc) { Instance *inst; + Mem *mem; inst = gcc->data; + mem = inst->mem; + if (inst->check_timer) ecore_timer_del(inst->check_timer); mem_config->instances = evas_list_remove(mem_config->instances, inst); - _mem_free(inst->mem); + + evas_object_event_callback_del(mem->mem_obj, EVAS_CALLBACK_MOUSE_DOWN, _mem_cb_mouse_down); + evas_object_event_callback_del(mem->mem_obj, EVAS_CALLBACK_MOUSE_MOVE, _mem_cb_mouse_in); + evas_object_event_callback_del(mem->mem_obj, EVAS_CALLBACK_MOUSE_IN, _mem_cb_mouse_in); + evas_object_event_callback_del(mem->mem_obj, EVAS_CALLBACK_MOUSE_OUT, _mem_cb_mouse_out); + + _mem_free(mem); free(inst); } =================================================================== RCS file: /cvs/e/e_modules/mem/mem.edc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- mem.edc 25 May 2006 23:32:39 -0000 1.13 +++ mem.edc 6 Jun 2006 14:39:40 -0000 1.14 @@ -1,6 +1,6 @@ images { - image: "module_icon.png" COMP; + image: "mem.png" COMP; image: "real_00.png" COMP; image: "real_01.png" COMP; image: "real_02.png" COMP; @@ -64,7 +64,6 @@ { name: "fade_clip"; type: RECT; - mouse_events: 1; description { state: "default" 0.0; @@ -85,7 +84,6 @@ { name: "mem"; type: IMAGE; - mouse_events: 1; clip_to: "fade_clip"; description { @@ -103,7 +101,7 @@ } image { - normal: "module_icon.png"; + normal: "mem.png"; } color: 255 255 255 192; } @@ -113,7 +111,6 @@ name: "real_meter"; type: IMAGE; clip_to: "fade_clip"; - mouse_events: 1; description { state: "default" 0.0; @@ -272,7 +269,6 @@ name: "swap_meter"; type: IMAGE; clip_to: "fade_clip"; - mouse_events: 1; description { state: "default" 0.0; =================================================================== RCS file: /cvs/e/e_modules/mem/module.eap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsH2pTa3 and /tmp/cvsHE9STT differ |