From 4b1965878db14a3e2c22370c3778371fef5fdf8a Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Tue, 6 Jun 2006 14:40:08 +0000
Subject: [PATCH] Removed mouse_events from edc. Delete evas_callbacks when
 shutdown.

SVN revision: 23213
---
 e_mod_main.c | 14 ++++++++++++--
 net.edc      |  4 ----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/e_mod_main.c b/e_mod_main.c
index 2bcfee7..e2ac4b3 100644
--- a/e_mod_main.c
+++ b/e_mod_main.c
@@ -78,6 +78,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
    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 @@ static void
 _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);
 }
 
diff --git a/net.edc b/net.edc
index a444fa5..bec7b2a 100644
--- a/net.edc
+++ b/net.edc
@@ -68,7 +68,6 @@ collections
 	       {
 		  name: "fade_clip";
 		  type: RECT;
-		  mouse_events: 1;
 		  description
 		    {
 		       state: "default" 0.0;
@@ -89,7 +88,6 @@ collections
 	       {
 		  name: "net";
 		  type: IMAGE;
-		  mouse_events: 1;
 		  clip_to: "fade_clip";
 		  description
 		    {
@@ -160,7 +158,6 @@ collections
 		  name: "rx_meter";
 		  type: IMAGE;
 		  clip_to: "fade_clip";
-		  mouse_events: 1;
 		  description
 		    {
 		       state: "default" 0.0;
@@ -319,7 +316,6 @@ collections
 		  name: "tx_meter";
 		  type: IMAGE;
 		  clip_to: "fade_clip";
-		  mouse_events: 1;
 		  description
 		    {
 		       state: "default" 0.0;