dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash when object type is null as pointed out by Jeonghyun Yun 

SVN revision: 64677
This commit is contained in:
Mike Blumenkrantz 2011-11-03 05:48:05 +00:00
parent 8f57c66a1c
commit 450b21e73d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/lib/els_icon.c
View File

@ -214,10 +214,13 @@ _els_smart_icon_size_get(const Evas_Object *obj, int *w, int *h)
Smart_Data *sd;
int tw, th;
int cw, ch;
const char *type;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
type = evas_object_type_get(sd->obj);
if (!type) return;
if (!strcmp(type, "edje"))
edje_object_size_min_get(sd->obj, &tw, &th);
else
evas_object_image_size_get(sd->obj, &tw, &th);
@ -499,13 +502,16 @@ static void
_smart_reconfigure(Smart_Data *sd)
{
Evas_Coord x, y, w, h;
const char *type;
if (!sd->obj) return;
w = sd->w;
h = sd->h;
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
type = evas_object_type_get(sd->obj);
if (!type) return;
if (!strcmp(type, "edje"))
{
x = sd->x;
y = sd->y;