From: Enlightenment S. <no-...@en...> - 2012-05-31 18:55:58
|
Log: elev8: CElmPhoto: fix image_set. Author: Fabio Mello <fab...@pr...> Author: acidx Date: 2012-05-31 11:55:51 -0700 (Thu, 31 May 2012) New Revision: 71590 Trac: http://trac.enlightenment.org/e/changeset/71590 Modified: trunk/PROTO/elev8/src/modules/elm/CElmPhoto.cc Modified: trunk/PROTO/elev8/src/modules/elm/CElmPhoto.cc =================================================================== --- trunk/PROTO/elev8/src/modules/elm/CElmPhoto.cc 2012-05-31 17:55:07 UTC (rev 71589) +++ trunk/PROTO/elev8/src/modules/elm/CElmPhoto.cc 2012-05-31 18:55:51 UTC (rev 71590) @@ -6,10 +6,12 @@ GENERATE_PROPERTY_CALLBACKS(CElmPhoto, size); GENERATE_PROPERTY_CALLBACKS(CElmPhoto, fill); +GENERATE_PROPERTY_CALLBACKS(CElmPhoto, image); GENERATE_TEMPLATE(CElmPhoto, PROPERTY(size), - PROPERTY(fill)); + PROPERTY(fill), + PROPERTY(image)); CElmPhoto::CElmPhoto(Local<Object> _jsObject, CElmObject *parent) : CElmObject(_jsObject, elm_photo_add(parent->GetEvasObject())) @@ -29,7 +31,7 @@ void CElmPhoto::image_set(Handle <Value> val) { - if (val->IsString()) + if (!val->IsString()) return; String::Utf8Value str(val); @@ -37,7 +39,7 @@ if (0 > access(*str, R_OK)) ELM_ERR("warning: can't read image file %s", *str); - if (elm_photo_file_set(eo, *str)) + if (!elm_photo_file_set(eo, *str)) ELM_ERR("Unable to set the image"); } |