Changes by ACR
authorKyuho Jo <kyuho.jo@samsung.com>
Fri, 20 Mar 2015 09:57:24 +0000 (18:57 +0900)
committerKyuho Jo <kyuho.jo@samsung.com>
Fri, 20 Mar 2015 09:57:24 +0000 (18:57 +0900)
Change-Id: Ie85d4e8c8b374ecce7abc9c1bd9eac780965ffa2
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>
src/abi.c
src/script_port.c

index 08e193e..37c1d87 100755 (executable)
--- a/src/abi.c
+++ b/src/abi.c
@@ -16,7 +16,7 @@ int script_buffer_load(void *handle)
                load = dlsym(RTLD_DEFAULT, "buffer_handler_load");
                if (!load) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -31,7 +31,7 @@ int script_buffer_unload(void *handle)
                unload = dlsym(RTLD_DEFAULT, "buffer_handler_unload");
                if (!unload) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -46,7 +46,7 @@ int script_buffer_is_loaded(const void *handle)
                is_loaded = dlsym(RTLD_DEFAULT, "buffer_handler_is_loaded");
                if (!is_loaded) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -61,7 +61,7 @@ int script_buffer_resize(void *handle, int w, int h)
                resize = dlsym(RTLD_DEFAULT, "buffer_handler_resize");
                if (!resize) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -121,7 +121,7 @@ int script_buffer_pixmap(const void *handle)
                buffer_pixmap = dlsym(RTLD_DEFAULT, "buffer_handler_pixmap");
                if (!buffer_pixmap) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -151,7 +151,7 @@ int script_buffer_pixmap_release_buffer(void *canvas)
                pixmap_release_buffer = dlsym(RTLD_DEFAULT, "buffer_handler_pixmap_release_buffer");
                if (!pixmap_release_buffer) {
                        ErrPrint("broekn ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -181,7 +181,7 @@ int script_buffer_pixmap_unref(void *buffer_ptr)
                pixmap_unref = dlsym(RTLD_DEFAULT, "buffer_handler_pixmap_unref");
                if (!pixmap_unref) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -241,7 +241,7 @@ int script_buffer_get_size(void *handle, int *w, int *h)
                get_size = dlsym(RTLD_DEFAULT, "buffer_handler_get_size");
                if (!get_size) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -301,7 +301,7 @@ int script_buffer_raw_close(void *buffer)
                raw_close = dlsym(RTLD_DEFAULT, "buffer_handler_raw_close");
                if (!raw_close) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -331,7 +331,7 @@ int script_buffer_raw_size(void *buffer)
                raw_size = dlsym(RTLD_DEFAULT, "buffer_handler_raw_size");
                if (!raw_size) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -346,7 +346,7 @@ int script_buffer_lock(void *handle)
                buffer_lock = dlsym(RTLD_DEFAULT, "buffer_handler_lock");
                if (!buffer_lock) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -361,7 +361,7 @@ int script_buffer_unlock(void *handle)
                buffer_unlock = dlsym(RTLD_DEFAULT, "buffer_handler_unlock");
                if (!buffer_unlock) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -376,7 +376,7 @@ int script_buffer_signal_emit(void *buffer_handle, const char *part, const char
                signal_emit = dlsym(RTLD_DEFAULT, "script_signal_emit");
                if (!signal_emit) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -391,7 +391,7 @@ int script_buffer_stride(void *handle)
                buffer_stride = dlsym(RTLD_DEFAULT, "buffer_handler_stride");
                if (!buffer_stride) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -406,7 +406,7 @@ int script_buffer_auto_align(void)
                buffer_auto_align = dlsym(RTLD_DEFAULT, "buffer_handler_auto_align");
                if (!buffer_auto_align) {
                        ErrPrint("borken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
@@ -421,7 +421,7 @@ int script_buffer_pixels(void *handle)
                buffer_pixels = dlsym(RTLD_DEFAULT, "buffer_handler_pixels");
                if (!buffer_pixels) {
                        ErrPrint("broken ABI: %s\n", dlerror());
-                       return WIDGET_STATUS_ERROR_NOT_IMPLEMENTED;
+                       return WIDGET_ERROR_NOT_SUPPORTED;
                }
        }
 
index a93ef04..c357e7b 100755 (executable)
@@ -176,7 +176,7 @@ PUBLIC int script_update_color(void *h, const char *id, const char *part, const
 
        edje = find_edje(handle, id);
        if (!edje) {
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        ret = sscanf(rgba, "%d %d %d %d %d %d %d %d %d %d %d %d",
@@ -185,7 +185,7 @@ PUBLIC int script_update_color(void *h, const char *id, const char *part, const
                        r + 2, g + 2, b + 2, a + 2);    /* SHADOW */
        if (ret != 12) {
                DbgPrint("id[%s] part[%s] rgba[%s]\n", id, part, rgba);
-               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+               return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
        ret = edje_object_color_class_set(elm_layout_edje_get(edje), part,
@@ -194,7 +194,7 @@ PUBLIC int script_update_color(void *h, const char *id, const char *part, const
                        r[2], g[2], b[2], a[2]); /* SHADOW */
 
        DbgPrint("EDJE[%s] color class is %s changed", id, ret == EINA_TRUE ? "successfully" : "not");
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 static void activate_cb(void *data, Evas_Object *part_obj, Elm_Object_Item *item)
@@ -251,13 +251,13 @@ PUBLIC int script_update_text(void *h, const char *id, const char *part, const c
        edje = find_edje(handle, id);
        if (!edje) {
                ErrPrint("Failed to find EDJE\n");
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        obj_info = evas_object_data_get(edje, "obj_info");
        if (!obj_info) {
                ErrPrint("Object info is not available\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        elm_object_part_text_set(edje, part, text ? text : "");
@@ -315,7 +315,7 @@ PUBLIC int script_update_text(void *h, const char *id, const char *part, const c
        }
 
 out:
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 static void parse_aspect(struct image_option *img_opt, const char *value, int len)
@@ -553,13 +553,13 @@ PUBLIC int script_update_access(void *_h, const char *id, const char *part, cons
        edje = find_edje(handle, id);
        if (!edje) {
                ErrPrint("No such object: %s\n", id);
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        obj_info = evas_object_data_get(edje, "obj_info");
        if (!obj_info) {
                ErrPrint("Object info is not available\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        edje_part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(edje), part);
@@ -597,7 +597,7 @@ PUBLIC int script_update_access(void *_h, const char *id, const char *part, cons
                ErrPrint("[%s] is not exists\n", part);
        }
 
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_operate_access(void *_h, const char *id, const char *part, const char *operation, const char *option)
@@ -609,19 +609,19 @@ PUBLIC int script_operate_access(void *_h, const char *id, const char *part, con
        int ret;
 
        if (!operation || !strlen(operation)) {
-               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+               return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
        edje = find_edje(handle, id);
        if (!edje) {
                ErrPrint("No such object: %s\n", id);
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        obj_info = evas_object_data_get(edje, "obj_info");
        if (!obj_info) {
                ErrPrint("Object info is not available\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        memset(&action_info, 0, sizeof(action_info));
@@ -680,7 +680,7 @@ PUBLIC int script_operate_access(void *_h, const char *id, const char *part, con
        }
 
 out:
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 static inline void apply_shadow_effect(struct image_option *img_opt, Evas_Object *img)
@@ -808,13 +808,13 @@ PUBLIC int script_update_image(void *_h, const char *id, const char *part, const
        edje = find_edje(handle, id);
        if (!edje) {
                ErrPrint("No such object: %s\n", id);
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        obj_info = evas_object_data_get(edje, "obj_info");
        if (!obj_info) {
                ErrPrint("Object info is not available\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        img = elm_object_part_content_unset(edje, part);
@@ -825,13 +825,13 @@ PUBLIC int script_update_image(void *_h, const char *id, const char *part, const
 
        if (!path || !strlen(path) || access(path, R_OK) != 0) {
                DbgPrint("SKIP - Path: [%s]\n", path);
-               return WIDGET_STATUS_ERROR_NONE;
+               return WIDGET_ERROR_NONE;
        }
 
        img = evas_object_image_add(handle->e);
        if (!img) {
                ErrPrint("Failed to add an image object\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        evas_object_image_preload(img, EINA_FALSE);
@@ -843,7 +843,7 @@ PUBLIC int script_update_image(void *_h, const char *id, const char *part, const
        if (err != EVAS_LOAD_ERROR_NONE) {
                ErrPrint("Load error: %s\n", evas_load_error_str(err));
                evas_object_del(img);
-               return WIDGET_STATUS_ERROR_IO_ERROR;
+               return WIDGET_ERROR_IO_ERROR;
        }
 
        apply_shadow_effect(&img_opt, img);
@@ -882,7 +882,7 @@ PUBLIC int script_update_image(void *_h, const char *id, const char *part, const
 
                        if (!part_w || !part_h || !w || !h) {
                                evas_object_del(img);
-                               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+                               return WIDGET_ERROR_INVALID_PARAMETER;
                        }
 
                        img = crop_image(img, path, part_w, part_h, w, h, &img_opt);
@@ -918,7 +918,7 @@ PUBLIC int script_update_image(void *_h, const char *id, const char *part, const
 
                        if (!part_w || !part_h || !w || !h) {
                                evas_object_del(img);
-                               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+                               return WIDGET_ERROR_INVALID_PARAMETER;
                        }
 
                        img = crop_image(img, path, part_w, part_h, w, h, &img_opt);
@@ -951,7 +951,7 @@ PUBLIC int script_update_image(void *_h, const char *id, const char *part, const
 
                        if (!part_w || !part_h || !w || !h) {
                                evas_object_del(img);
-                               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+                               return WIDGET_ERROR_INVALID_PARAMETER;
                        }
 
                        img = crop_image(img, path, part_w, part_h, w, h, &img_opt);
@@ -988,7 +988,7 @@ PUBLIC int script_update_image(void *_h, const char *id, const char *part, const
         * This object is not registered as an access object.
         * So the developer should add it to access list manually, using DESC_ACCESS block.
         */
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 static void script_signal_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
@@ -1117,18 +1117,18 @@ PUBLIC int script_feed_event(void *h, int event_type, int x, int y, int type, un
        struct info *handle = h;
        Evas_Object *edje;
        struct obj_info *obj_info;
-       int ret = WIDGET_STATUS_ERROR_NONE;
+       int ret = WIDGET_ERROR_NONE;
 
        edje = find_edje(handle, NULL); /*!< Get the base layout */
        if (!edje) {
                ErrPrint("Base layout is not exist\n");
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        obj_info = evas_object_data_get(edje, "obj_info");
        if (!obj_info) {
                ErrPrint("Object info is not valid\n");
-               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+               return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
        if (event_type & WIDGET_SCRIPT_ACCESS_EVENT) {
@@ -1294,7 +1294,7 @@ PUBLIC int script_feed_event(void *h, int event_type, int x, int y, int type, un
 #endif
                if (cur_timestamp - timestamp > 0.1f && handle->is_mouse_down == 0) {
                        DbgPrint("Discard lazy event : %lf\n", cur_timestamp - timestamp);
-                       return WIDGET_STATUS_ERROR_NONE;
+                       return WIDGET_ERROR_NONE;
                }
 
                switch (event_type) {
@@ -1347,7 +1347,7 @@ PUBLIC int script_feed_event(void *h, int event_type, int x, int y, int type, un
                        evas_event_default_flags_set(handle->e, flags);
                        break;
                default:
-                       return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+                       return WIDGET_ERROR_INVALID_PARAMETER;
                }
        } else if (event_type & WIDGET_SCRIPT_KEY_EVENT) {
                const char *keyname = "";
@@ -1413,13 +1413,13 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
        edje = find_edje(handle, src_id);
        if (!edje) {
                ErrPrint("Edje is not exists (%s)\n", src_id);
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        obj_info = evas_object_data_get(edje, "obj_info");
        if (!obj_info) {
                ErrPrint("Object info is not valid\n");
-               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+               return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
        obj = elm_object_part_content_unset(edje, part);
@@ -1435,7 +1435,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
 
        if (!path || !strlen(path) || access(path, R_OK) != 0) {
                DbgPrint("SKIP - Path: [%s]\n", path);
-               return WIDGET_STATUS_ERROR_NONE;
+               return WIDGET_ERROR_NONE;
        }
 
        if (!target_id) {
@@ -1469,7 +1469,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
        obj = elm_layout_add(edje);
        if (!obj) {
                ErrPrint("Failed to add a new edje object\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        edje_object_scale_set(elm_layout_edje_get(obj), elm_config_scale_get());
@@ -1481,7 +1481,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
                        ErrPrint("Could not load %s from %s: %s\n", group, path, edje_load_error_str(err));
                }
                evas_object_del(obj);
-               return WIDGET_STATUS_ERROR_IO_ERROR;
+               return WIDGET_ERROR_IO_ERROR;
        }
 
        evas_object_show(obj);
@@ -1490,7 +1490,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
        if (!obj_info) {
                ErrPrint("Failed to add a obj_info\n");
                evas_object_del(obj);
-               return WIDGET_STATUS_ERROR_OUT_OF_MEMORY;
+               return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
        obj_info->id = strdup(target_id);
@@ -1498,7 +1498,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
                ErrPrint("Failed to add a obj_info\n");
                free(obj_info);
                evas_object_del(obj);
-               return WIDGET_STATUS_ERROR_OUT_OF_MEMORY;
+               return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
        obj_info->parent = edje;
@@ -1509,7 +1509,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
                free(obj_info->id);
                free(obj_info);
                evas_object_del(obj);
-               return WIDGET_STATUS_ERROR_OUT_OF_MEMORY;
+               return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
        child->part = strdup(part);
@@ -1519,7 +1519,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
                free(obj_info->id);
                free(obj_info);
                evas_object_del(obj);
-               return WIDGET_STATUS_ERROR_OUT_OF_MEMORY;
+               return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
        child->obj = obj;
@@ -1535,7 +1535,7 @@ PUBLIC int script_update_script(void *h, const char *src_id, const char *target_
        obj_info = evas_object_data_get(edje, "obj_info");
        obj_info->children = eina_list_append(obj_info->children, child);
 
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_update_signal(void *h, const char *id, const char *part, const char *signal)
@@ -1545,11 +1545,11 @@ PUBLIC int script_update_signal(void *h, const char *id, const char *part, const
 
        edje = find_edje(handle, id);
        if (!edje) {
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        elm_object_signal_emit(edje, signal, part);
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_update_drag(void *h, const char *id, const char *part, double x, double y)
@@ -1559,11 +1559,11 @@ PUBLIC int script_update_drag(void *h, const char *id, const char *part, double
 
        edje = find_edje(handle, id);
        if (!edje) {
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        edje_object_part_drag_value_set(elm_layout_edje_get(edje), part, x, y);
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_update_size(void *han, const char *id, int w, int h)
@@ -1573,7 +1573,7 @@ PUBLIC int script_update_size(void *han, const char *id, int w, int h)
 
        edje = find_edje(handle, id);
        if (!edje) {
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        if (!id) {
@@ -1586,7 +1586,7 @@ PUBLIC int script_update_size(void *han, const char *id, int w, int h)
 
        DbgPrint("Resize object to %dx%d\n", w, h);
        evas_object_resize(edje, w, h);
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_update_category(void *h, const char *id, const char *category)
@@ -1599,16 +1599,16 @@ PUBLIC int script_update_category(void *h, const char *id, const char *category)
        }
 
        if (!category) {
-               return WIDGET_STATUS_ERROR_NONE;
+               return WIDGET_ERROR_NONE;
        }
 
        handle->category = strdup(category);
        if (!handle->category) {
                ErrPrint("Error: %s\n", strerror(errno));
-               return WIDGET_STATUS_ERROR_OUT_OF_MEMORY;
+               return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC void *script_create(void *buffer_handle, const char *file, const char *group)
@@ -1652,7 +1652,7 @@ PUBLIC int script_destroy(void *_handle)
 
        if (!eina_list_data_find(s_info.handle_list, handle)) {
                DbgPrint("Not found (already deleted?)\n");
-               return WIDGET_STATUS_ERROR_NOT_EXIST;
+               return WIDGET_ERROR_NOT_EXIST;
        }
 
        s_info.handle_list = eina_list_remove(s_info.handle_list, handle);
@@ -1667,7 +1667,7 @@ PUBLIC int script_destroy(void *_handle)
        free(handle->file);
        free(handle->group);
        free(handle);
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 static void sw_render_pre_cb(void *data, Evas *e, void *event_info)
@@ -1807,12 +1807,12 @@ static void free_fb(void *data, void *ptr)
 static int destroy_ecore_evas(struct info *handle)
 {
        if (!handle->ee) {
-               return WIDGET_STATUS_ERROR_NONE;
+               return WIDGET_ERROR_NONE;
        }
        ecore_evas_free(handle->ee);
        handle->ee = NULL;
        handle->e = NULL;
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 static int create_ecore_evas(struct info *handle, int *w, int *h)
@@ -1820,7 +1820,7 @@ static int create_ecore_evas(struct info *handle, int *w, int *h)
        script_buffer_get_size(handle->buffer_handle, w, h);
        if (*w == 0 && *h == 0) {
                ErrPrint("ZERO size FB accessed\n");
-               return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+               return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
        if (handle->ee) {
@@ -1833,7 +1833,7 @@ static int create_ecore_evas(struct info *handle, int *w, int *h)
                        ecore_evas_resize(handle->ee, *w, *h);
                }
 
-               return WIDGET_STATUS_ERROR_NONE;
+               return WIDGET_ERROR_NONE;
        }
 
        if (!script_buffer_auto_align() && s_info.alloc_canvas_with_stride) {
@@ -1842,12 +1842,12 @@ static int create_ecore_evas(struct info *handle, int *w, int *h)
                handle->ee = s_info.alloc_canvas(*w, *h, alloc_fb, free_fb, handle);
        } else {
                ErrPrint("Failed to allocate canvas\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        if (!handle->ee) {
                ErrPrint("Failed to create a buffer\n");
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        handle->e = ecore_evas_get(handle->ee);
@@ -1855,7 +1855,7 @@ static int create_ecore_evas(struct info *handle, int *w, int *h)
                ErrPrint("Failed to get an Evas\n");
                ecore_evas_free(handle->ee);
                handle->ee = NULL;
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        if (script_buffer_type(handle->buffer_handle) == BUFFER_TYPE_PIXMAP) {
@@ -1887,7 +1887,7 @@ static int create_ecore_evas(struct info *handle, int *w, int *h)
        ecore_evas_show(handle->ee);
        ecore_evas_activate(handle->ee);
 
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_load(void *_handle, int (*render_pre)(void *buffer_handle, void *data), int (*render_post)(void *render_handle, void *data), void *data)
@@ -1919,7 +1919,7 @@ PUBLIC int script_load(void *_handle, int (*render_pre)(void *buffer_handle, voi
        if (!obj_info) {
                ErrPrint("Heap: %s\n", strerror(errno));
                destroy_ecore_evas(handle);
-               return WIDGET_STATUS_ERROR_OUT_OF_MEMORY;
+               return WIDGET_ERROR_OUT_OF_MEMORY;
        }
 
        obj_info->parent = evas_object_rectangle_add(handle->e);
@@ -1927,7 +1927,7 @@ PUBLIC int script_load(void *_handle, int (*render_pre)(void *buffer_handle, voi
                ErrPrint("Unable to create a parent box\n");
                free(obj_info);
                destroy_ecore_evas(handle);
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        edje = elm_layout_add(obj_info->parent);
@@ -1936,7 +1936,7 @@ PUBLIC int script_load(void *_handle, int (*render_pre)(void *buffer_handle, voi
                evas_object_del(obj_info->parent);
                free(obj_info);
                destroy_ecore_evas(handle);
-               return WIDGET_STATUS_ERROR_FAULT;
+               return WIDGET_ERROR_FAULT;
        }
 
        edje_object_scale_set(elm_layout_edje_get(edje), elm_config_scale_get());
@@ -1952,7 +1952,7 @@ PUBLIC int script_load(void *_handle, int (*render_pre)(void *buffer_handle, voi
                evas_object_del(obj_info->parent);
                free(obj_info);
                destroy_ecore_evas(handle);
-               return WIDGET_STATUS_ERROR_IO_ERROR;
+               return WIDGET_ERROR_IO_ERROR;
        }
 
        handle->parent = edje;
@@ -1966,7 +1966,7 @@ PUBLIC int script_load(void *_handle, int (*render_pre)(void *buffer_handle, voi
        evas_object_data_set(edje, "obj_info", obj_info);
 
        handle->obj_list = eina_list_append(handle->obj_list, edje);
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_unload(void *_handle)
@@ -1986,7 +1986,7 @@ PUBLIC int script_unload(void *_handle)
        }
 
        (void)destroy_ecore_evas(handle);
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 static void access_cb(keynode_t *node, void *user_data)
@@ -2144,7 +2144,7 @@ PUBLIC int script_init(double scale, int premultiplied)
                ErrPrint("No way to allocate canvas\n");
        }
 
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 PUBLIC int script_fini(void)
@@ -2177,7 +2177,7 @@ PUBLIC int script_fini(void)
 
        free(s_info.font_name);
        s_info.font_name = NULL;
-       return WIDGET_STATUS_ERROR_NONE;
+       return WIDGET_ERROR_NONE;
 }
 
 /* End of a file */