[prev in list] [next in list] [prev in thread] [next in thread] 

List:       enlightenment-svn
Subject:    E SVN: acidx trunk/PROTO/elev8/src/modules/elm
From:       "Enlightenment SVN" <no-reply () enlightenment ! org>
Date:       2012-05-31 18:55:51
Message-ID: 20120531185552.09D78118096 () e2 ! enlightenment ! org
[Download RAW message or body]

Log:
elev8: CElmPhoto: fix image_set.
  
  Author:    Fabio Mello <fabio.mello@profusion.mobi>

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");
 }
 


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
enlightenment-svn mailing list
enlightenment-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
[prev in list] [next in list] [prev in thread] [next in thread]