Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : net
Dir : e_modules/net
Modified Files:
e_mod_main.c net.edc
Log Message:
Removed mouse_events from edc.
Delete evas_callbacks when shutdown.
===================================================================
RCS file: /cvs/e/e_modules/net/e_mod_main.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_mod_main.c 6 Jun 2006 08:45:29 -0000 1.38
+++ e_mod_main.c 6 Jun 2006 14:40:08 -0000 1.39
@@ -78,6 +78,7 @@
inst->net_obj = o;
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_net_cb_mouse_down, inst);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE,
_net_cb_mouse_in, inst);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, _net_cb_mouse_in,
inst);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
_net_cb_mouse_out, inst);
@@ -121,11 +122,20 @@
_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+ Net *net;
+
inst = gcc->data;
+ net = inst->net;
+
if (inst->check_timer) ecore_timer_del(inst->check_timer);
net_config->instances = evas_list_remove(net_config->instances, inst);
- _net_free(inst->net);
+
+ evas_object_event_callback_del(net->net_obj, EVAS_CALLBACK_MOUSE_DOWN,
_net_cb_mouse_down);
+ evas_object_event_callback_del(net->net_obj, EVAS_CALLBACK_MOUSE_MOVE,
_net_cb_mouse_in);
+ evas_object_event_callback_del(net->net_obj, EVAS_CALLBACK_MOUSE_IN,
_net_cb_mouse_in);
+ evas_object_event_callback_del(net->net_obj, EVAS_CALLBACK_MOUSE_OUT,
_net_cb_mouse_out);
+
+ _net_free(net);
free(inst);
}
===================================================================
RCS file: /cvs/e/e_modules/net/net.edc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- net.edc 3 Jun 2006 03:56:46 -0000 1.19
+++ net.edc 6 Jun 2006 14:40:08 -0000 1.20
@@ -68,7 +68,6 @@
{
name: "fade_clip";
type: RECT;
- mouse_events: 1;
description
{
state: "default" 0.0;
@@ -89,7 +88,6 @@
{
name: "net";
type: IMAGE;
- mouse_events: 1;
clip_to: "fade_clip";
description
{
@@ -160,7 +158,6 @@
name: "rx_meter";
type: IMAGE;
clip_to: "fade_clip";
- mouse_events: 1;
description
{
state: "default" 0.0;
@@ -319,7 +316,6 @@
name: "tx_meter";
type: IMAGE;
clip_to: "fade_clip";
- mouse_events: 1;
description
{
state: "default" 0.0;
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
