Removed mouse_events from edc.
Delete evas_callbacks when shutdown. SVN revision: 23213
This commit is contained in:
parent
c258698c57
commit
4b1965878d
14
e_mod_main.c
14
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;
|
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_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_IN, _net_cb_mouse_in, inst);
|
||||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _net_cb_mouse_out, 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)
|
_gc_shutdown(E_Gadcon_Client *gcc)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
Net *net;
|
||||||
|
|
||||||
inst = gcc->data;
|
inst = gcc->data;
|
||||||
|
net = inst->net;
|
||||||
|
|
||||||
if (inst->check_timer) ecore_timer_del(inst->check_timer);
|
if (inst->check_timer) ecore_timer_del(inst->check_timer);
|
||||||
net_config->instances = evas_list_remove(net_config->instances, inst);
|
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);
|
free(inst);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
4
net.edc
4
net.edc
|
@ -68,7 +68,6 @@ collections
|
||||||
{
|
{
|
||||||
name: "fade_clip";
|
name: "fade_clip";
|
||||||
type: RECT;
|
type: RECT;
|
||||||
mouse_events: 1;
|
|
||||||
description
|
description
|
||||||
{
|
{
|
||||||
state: "default" 0.0;
|
state: "default" 0.0;
|
||||||
|
@ -89,7 +88,6 @@ collections
|
||||||
{
|
{
|
||||||
name: "net";
|
name: "net";
|
||||||
type: IMAGE;
|
type: IMAGE;
|
||||||
mouse_events: 1;
|
|
||||||
clip_to: "fade_clip";
|
clip_to: "fade_clip";
|
||||||
description
|
description
|
||||||
{
|
{
|
||||||
|
@ -160,7 +158,6 @@ collections
|
||||||
name: "rx_meter";
|
name: "rx_meter";
|
||||||
type: IMAGE;
|
type: IMAGE;
|
||||||
clip_to: "fade_clip";
|
clip_to: "fade_clip";
|
||||||
mouse_events: 1;
|
|
||||||
description
|
description
|
||||||
{
|
{
|
||||||
state: "default" 0.0;
|
state: "default" 0.0;
|
||||||
|
@ -319,7 +316,6 @@ collections
|
||||||
name: "tx_meter";
|
name: "tx_meter";
|
||||||
type: IMAGE;
|
type: IMAGE;
|
||||||
clip_to: "fade_clip";
|
clip_to: "fade_clip";
|
||||||
mouse_events: 1;
|
|
||||||
description
|
description
|
||||||
{
|
{
|
||||||
state: "default" 0.0;
|
state: "default" 0.0;
|
||||||
|
|
Loading…
Reference in New Issue