diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2010-10-20 07:55:20 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2010-10-20 07:55:20 +0000 |
commit | 2d28628c95718de0e9ea89fd1e8db321ea8283b1 (patch) | |
tree | 86dafb58fbc107969ee1a82ece2d2dead4ac37ac /legacy/emotion/src/lib/emotion_smart.c | |
parent | 02dced207e84fabe3f67e6949ee1f216a1c0051b (diff) |
API break: emotion_object_file_set() returns a boolean, now.
SVN revision: 53648
Diffstat (limited to '')
-rw-r--r-- | legacy/emotion/src/lib/emotion_smart.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c index 30d0951b40..ad649707e7 100644 --- a/legacy/emotion/src/lib/emotion_smart.c +++ b/legacy/emotion/src/lib/emotion_smart.c | |||
@@ -314,7 +314,7 @@ emotion_object_init(Evas_Object *obj, const char *module_filename) | |||
314 | return EINA_TRUE; | 314 | return EINA_TRUE; |
315 | } | 315 | } |
316 | 316 | ||
317 | EAPI void | 317 | EAPI Eina_Bool |
318 | emotion_object_file_set(Evas_Object *obj, const char *file) | 318 | emotion_object_file_set(Evas_Object *obj, const char *file) |
319 | { | 319 | { |
320 | Smart_Data *sd; | 320 | Smart_Data *sd; |
@@ -322,9 +322,9 @@ emotion_object_file_set(Evas_Object *obj, const char *file) | |||
322 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); | 322 | E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); |
323 | 323 | ||
324 | DBG("file=%s", file); | 324 | DBG("file=%s", file); |
325 | if (!sd->module) return; | 325 | if (!sd->module) return EINA_FALSE; |
326 | 326 | ||
327 | if ((file) && (sd->file) && (!strcmp(file, sd->file))) return; | 327 | if ((file) && (sd->file) && (!strcmp(file, sd->file))) return EINA_FALSE; |
328 | if ((file) && (file[0] != 0)) | 328 | if ((file) && (file[0] != 0)) |
329 | { | 329 | { |
330 | int w, h; | 330 | int w, h; |
@@ -334,7 +334,7 @@ emotion_object_file_set(Evas_Object *obj, const char *file) | |||
334 | sd->module->file_close(sd->video); | 334 | sd->module->file_close(sd->video); |
335 | evas_object_image_size_set(sd->obj, 1, 1); | 335 | evas_object_image_size_set(sd->obj, 1, 1); |
336 | if (!sd->module->file_open(sd->file, obj, sd->video)) | 336 | if (!sd->module->file_open(sd->file, obj, sd->video)) |
337 | return; | 337 | return EINA_FALSE; |
338 | sd->module->size_get(sd->video, &w, &h); | 338 | sd->module->size_get(sd->video, &w, &h); |
339 | evas_object_image_size_set(sd->obj, w, h); | 339 | evas_object_image_size_set(sd->obj, w, h); |
340 | _emotion_image_data_zero(sd->obj); | 340 | _emotion_image_data_zero(sd->obj); |
@@ -353,6 +353,8 @@ emotion_object_file_set(Evas_Object *obj, const char *file) | |||
353 | free(sd->file); | 353 | free(sd->file); |
354 | sd->file = NULL; | 354 | sd->file = NULL; |
355 | } | 355 | } |
356 | |||
357 | return EINA_TRUE; | ||
356 | } | 358 | } |
357 | 359 | ||
358 | EAPI const char * | 360 | EAPI const char * |