From 9fb0640d5732ddfdc9de822bb1e7fb31e55410e6 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 16 Apr 2014 12:27:40 +0900 Subject: [PATCH] Revert "eo null object complaints - silence." This reverts commit 1678d272af676a17e4608de655f231171c5a5af2. ... actually... on second thought... i think eo just needs to sensibly handle null objects. --- src/lib/edje/edje_load.c | 4 ++-- src/lib/edje/edje_smart.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 3bb3b0e..51a21a9 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -1224,7 +1224,7 @@ _edje_object_collect(Edje *ed) break; } case EDJE_USER_SWALLOW: - edje_object_part_unswallow(ed->obj, eud->u.swallow.child); + edje_object_part_unswallow(NULL, eud->u.swallow.child); break; case EDJE_USER_DRAG_STEP: case EDJE_USER_DRAG_PAGE: @@ -1965,4 +1965,4 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *sig, const char *sou if (ed_parent) _edje_util_message_send(ed_parent, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg); -} +} \ No newline at end of file diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index ab4b65c..a4de77f 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -166,15 +166,13 @@ _edje_evas_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y) ep = ed->table_parts[i]; if ((ep->type == EDJE_RP_TYPE_TEXT) && (ep->typedata.text)) { - if (ep->object) - evas_object_move(ep->object, - ed->x + ep->x + ep->typedata.text->offset.x, - ed->y + ep->y + ep->typedata.text->offset.y); + evas_object_move(ep->object, + ed->x + ep->x + ep->typedata.text->offset.x, + ed->y + ep->y + ep->typedata.text->offset.y); } else { - if (ep->object) - evas_object_move(ep->object, ed->x + ep->x, ed->y + ep->y); + evas_object_move(ep->object, ed->x + ep->x, ed->y + ep->y); if ((ep->type == EDJE_RP_TYPE_SWALLOW) && (ep->typedata.swallow)) { -- 2.7.4