jackdanielz pushed a commit to branch master.
commit 49d904371c50ef5d07c6a8443aa175003a51e709
Author: Daniel Zaoui <[email protected]>
Date: Thu Mar 14 11:35:34 2013 +0200
Elementary: check object class
We need to check that the object is an edje object before calling the
edje function.
---
src/lib/elm_colorselector.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 9321ca3..bc5da90 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1141,7 +1141,8 @@ _sub_obj_size_hints_set(Evas_Object *sobj,
Evas_Coord minw = -1, minh = -1;
elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh);
- edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh);
+ if (sobj && eo_isa(sobj, EDJE_OBJ_CLASS))
+ edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh);
evas_object_size_hint_min_set(sobj, minw, minh);
evas_object_size_hint_max_set(sobj, -1, -1);
}
@@ -1154,7 +1155,8 @@ _item_sizing_eval(Elm_Color_Item *item)
if (!item) return;
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
- edje_object_size_min_restricted_calc(VIEW(item), &minw, &minh, minw, minh);
+ if (VIEW(item) && eo_isa(VIEW(item), EDJE_OBJ_CLASS))
+ edje_object_size_min_restricted_calc(VIEW(item), &minw, &minh, minw,
minh);
evas_object_size_hint_min_set(VIEW(item), minw, minh);
}
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
