projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
71c5455
)
only unswallow deleted swallowed parts if they're in a swallow (wtf.)
author
Mike Blumenkrantz
<m.blumenkran@samsung.com>
Thu, 17 Oct 2013 09:17:07 +0000
(10:17 +0100)
committer
Mike Blumenkrantz
<m.blumenkran@samsung.com>
Thu, 17 Oct 2013 09:17:33 +0000
(10:17 +0100)
src/lib/edje/edje_util.c
patch
|
blob
|
history
diff --git
a/src/lib/edje/edje_util.c
b/src/lib/edje/edje_util.c
index
d4f093f
..
08182f6
100644
(file)
--- a/
src/lib/edje/edje_util.c
+++ b/
src/lib/edje/edje_util.c
@@
-6278,7
+6278,7
@@
_edje_object_part_swallow_free_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, E
break;
}
rp = evas_object_data_get(obj, "\377 edje.swallowing_part");
- if (rp)
+ if (rp
&& (rp->part->type == EDJE_PART_TYPE_SWALLOW)
)
edje_object_part_unswallow(ed->obj, obj);
return;