summaryrefslogtreecommitdiff
path: root/src/bin/e_comp_object.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/e_comp_object.c')
-rw-r--r--src/bin/e_comp_object.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index d52ea2b..14d3a64 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -663,7 +663,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
663 { 663 {
664 if (cw->zoomap_disabled) 664 if (cw->zoomap_disabled)
665 { 665 {
666 if (cw->frame_object && (e_zoomap_child_get(cw->zoomobj) == cw->frame_object)) return EINA_FALSE; 666 if (cw->frame_object && (cw->zoomobj && e_zoomap_child_get(cw->zoomobj) == cw->frame_object)) return EINA_FALSE;
667 } 667 }
668 else 668 else
669 { 669 {
@@ -2989,7 +2989,6 @@ e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del)
2989{ 2989{
2990 Eina_List *l; 2990 Eina_List *l;
2991 2991
2992 SOFT_ENTRY();
2993 EINA_SAFETY_ON_NULL_RETURN(to_del); 2992 EINA_SAFETY_ON_NULL_RETURN(to_del);
2994 l = evas_object_data_get(obj, "comp_object-to_del"); 2993 l = evas_object_data_get(obj, "comp_object-to_del");
2995 evas_object_data_set(obj, "comp_object-to_del", eina_list_append(l, to_del)); 2994 evas_object_data_set(obj, "comp_object-to_del", eina_list_append(l, to_del));
@@ -3178,12 +3177,15 @@ E_API void
3178e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on) 3177e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on)
3179{ 3178{
3180 int x, y, w, h, ow, oh; 3179 int x, y, w, h, ow, oh;
3181 E_Comp_Object *cw2; 3180 E_Comp_Object *cw2 = NULL;
3181 const char *type;
3182 3182
3183 SOFT_ENTRY(); 3183 SOFT_ENTRY();
3184 EINA_SAFETY_ON_NULL_RETURN(on); 3184 EINA_SAFETY_ON_NULL_RETURN(on);
3185 3185
3186 cw2 = evas_object_smart_data_get(on); 3186 type = evas_object_type_get(on);
3187 if ((type) && (!strcmp(type, "e_comp_object")))
3188 cw2 = evas_object_smart_data_get(on);
3187 if (cw2 && eina_streq(evas_object_type_get(on), SMART_NAME)) 3189 if (cw2 && eina_streq(evas_object_type_get(on), SMART_NAME))
3188 x = cw2->ec->x, y = cw2->ec->y, w = cw2->ec->w, h = cw2->ec->h; 3190 x = cw2->ec->x, y = cw2->ec->y, w = cw2->ec->w, h = cw2->ec->h;
3189 else 3191 else