Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_load.c edje_message_queue.c
Log Message:
deferred message bug. fixeed.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- edje_load.c 20 Nov 2004 04:43:37 -0000 1.52
+++ edje_load.c 2 Dec 2004 09:21:22 -0000 1.53
@@ -589,26 +589,29 @@
rp = ed->parts->data;
ed->parts = evas_list_remove(ed->parts, rp);
- evas_object_event_callback_del(rp->object,
- EVAS_CALLBACK_MOUSE_IN,
- _edje_mouse_in_cb);
- evas_object_event_callback_del(rp->object,
- EVAS_CALLBACK_MOUSE_OUT,
- _edje_mouse_out_cb);
- evas_object_event_callback_del(rp->object,
- EVAS_CALLBACK_MOUSE_DOWN,
+ if (rp->object)
+ {
+ evas_object_event_callback_del(rp->object,
+ EVAS_CALLBACK_MOUSE_IN,
+ _edje_mouse_in_cb);
+ evas_object_event_callback_del(rp->object,
+ EVAS_CALLBACK_MOUSE_OUT,
+ _edje_mouse_out_cb);
+ evas_object_event_callback_del(rp->object,
+ EVAS_CALLBACK_MOUSE_DOWN,
_edje_mouse_down_cb);
- evas_object_event_callback_del(rp->object,
- EVAS_CALLBACK_MOUSE_UP,
- _edje_mouse_up_cb);
- evas_object_event_callback_del(rp->object,
- EVAS_CALLBACK_MOUSE_MOVE,
- _edje_mouse_move_cb);
- evas_object_event_callback_del(rp->object,
- EVAS_CALLBACK_MOUSE_WHEEL,
- _edje_mouse_wheel_cb);
- _edje_text_real_part_on_del(ed, rp);
- evas_object_del(rp->object);
+ evas_object_event_callback_del(rp->object,
+ EVAS_CALLBACK_MOUSE_UP,
+ _edje_mouse_up_cb);
+ evas_object_event_callback_del(rp->object,
+ EVAS_CALLBACK_MOUSE_MOVE,
+ _edje_mouse_move_cb);
+ evas_object_event_callback_del(rp->object,
+ EVAS_CALLBACK_MOUSE_WHEEL,
+ _edje_mouse_wheel_cb);
+ _edje_text_real_part_on_del(ed, rp);
+ evas_object_del(rp->object);
+ }
if (rp->swallowed_object)
{
evas_object_smart_member_del(rp->swallowed_object);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje_message_queue.c 30 Oct 2004 02:30:55 -0000 1.12
+++ edje_message_queue.c 2 Dec 2004 09:21:22 -0000 1.13
@@ -127,7 +127,6 @@
em->type = type;
em->id = id;
em->edje->message.num++;
- _edje_ref(em->edje);
return em;
}
@@ -243,7 +242,6 @@
}
}
em->edje->message.num--;
- _edje_unref(em->edje);
free(em);
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
