aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_object_image.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-05-20 14:56:45 +0100
committerTom Hacohen <tom@stosb.com>2015-05-20 16:25:38 +0100
commit92fb2917cba7b91a83fbfd39b876d585921d6d3e (patch)
tree4a9aa3641cd5a3ddf706f51a262adfc405d96d9d /src/lib/evas/canvas/evas_object_image.c
parentEcore con url: Fix wrong object destruction. (diff)
downloadefl-92fb2917cba7b91a83fbfd39b876d585921d6d3e.tar.gz
Eo: Remove eo_error_set() and clean up finalizer()
This is another cleanup in perparation for the Eo stable release. This is no longer needed thanks to the proper error reporting with eo_constructor()'s new return value. The finalizer change cleans it up a bit so it catches more cases/issues. This also means that the finalizer cleans up the object in all cases, and not only some. @feature.
Diffstat (limited to 'src/lib/evas/canvas/evas_object_image.c')
-rw-r--r--src/lib/evas/canvas/evas_object_image.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 5e59dbb835..366e341e94 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -309,7 +309,7 @@ _evas_object_image_cleanup(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
}
static Eina_Bool
-_init_cow(Eo *eo_obj)
+_init_cow(void)
{
if (!evas_object_image_load_opts_cow ||
!evas_object_image_pixels_cow ||
@@ -335,7 +335,7 @@ _init_cow(Eo *eo_obj)
!evas_object_image_pixels_cow ||
!evas_object_image_state_cow)
{
- eo_error_set(eo_obj);
+ ERR("Failed to init cow.");
return EINA_FALSE;
}
@@ -358,7 +358,7 @@ _evas_image_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
evas_object_image_init(eo_obj);
evas_object_inject(eo_obj, obj, eo_e);
- if (!_init_cow(eo_obj))
+ if (!_init_cow())
return NULL;
o->load_opts = eina_cow_alloc(evas_object_image_load_opts_cow);