Fix build errors

Accessibility features are not valid now.

Change-Id: I084b42c867c47ffad1a7095b6c04591280aa2165

diff --git a/packaging/libwidget_edje.spec b/packaging/libwidget_edje.spec
index 6e04fec..5fc1b4c 100644 (file)
--- a/packaging/libwidget_edje.spec
+++ b/packaging/libwidget_edje.spec
@@ -2,7 +2,7 @@ Name: libwidget_edje
 Summary: EDJE Script loader for the data provider master
 Version: 1.0.0
 Release: 1
-Group: HomeTF/widget
+Group: Applications/Core Applications
 License: Flora License, Version 1.1
 Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(widget_service)
 BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(efl-assist)
-BuildRequires: model-build-features
 
 %description
 Plugin for the data provider master to load the edje scripts
@@ -52,7 +51,7 @@ mkdir -p %{buildroot}/%{_datarootdir}/license
 %files -n libwidget_edje
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/share/data-provider-master/plugin-script/*.so*
+%{_datarootdir}/data-provider-master/plugin-script/*.so*
 %{_datarootdir}/license/*
 
 # End of a file

diff --git a/src/script_port.c b/src/script_port.c
index bd497b7..f26144c 100644 (file)
--- a/src/script_port.c
+++ b/src/script_port.c
@@ -307,7 +307,7 @@ PUBLIC int script_update_text(void *h, const char *id, const char *part, const c
                        goto out;
                }
 
-               elm_access_info_set(ao, ELM_ACCESS_INFO, utf8);
+               elm_access_info_set(ao, 0 /* ELM_ACCESS_INFO */, utf8);
                free(utf8);
 
                update_focus_chain(handle, ao);
@@ -570,7 +570,7 @@ PUBLIC int script_update_access(void *_h, const char *id, const char *part, cons
                ao = evas_object_data_get(edje_part, "ao");
                if (ao) {
                        if (text && strlen(text)) {
-                               elm_access_info_set(ao, ELM_ACCESS_INFO, text);
+                               elm_access_info_set(ao, 0 /* ELM_ACCESS_INFO */, text);
                                DbgPrint("Access info is updated: %s [%s], %p\n", part, text, ao);
                                update_focus_chain(handle, ao);
                        } else {
@@ -586,7 +586,7 @@ PUBLIC int script_update_access(void *_h, const char *id, const char *part, cons
                        if (!ao) {
                                ErrPrint("Unable to register an access object(%s)\n", part);
                        } else {
-                               elm_access_info_set(ao, ELM_ACCESS_INFO, text);
+                               elm_access_info_set(ao, 0 /* ELM_ACCESS_INFO */, text);
 
                                evas_object_data_set(edje_part, "ao", ao);
                                elm_object_focus_custom_chain_append(handle->parent, ao, NULL);
@@ -653,25 +653,25 @@ PUBLIC int script_operate_access(void *_h, const char *id, const char *part, con
                }
 
                DbgPrint("TXxTY: %dx%d\n", action_info.x, action_info.y);
-               ret = elm_access_action(edje, ELM_ACCESS_ACTION_HIGHLIGHT, &action_info);
+               ret = elm_access_action(edje, 0 /* ELM_ACCESS_ACTION_HIGHLIGHT */, &action_info);
                if (ret == EINA_FALSE) {
                        ErrPrint("Action error\n");
                }
        } else if (!strcasecmp(operation, "unset,hl")) {
-               ret = elm_access_action(edje, ELM_ACCESS_ACTION_UNHIGHLIGHT, &action_info);
+               ret = elm_access_action(edje, 0 /* ELM_ACCESS_ACTION_UNHIGHLIGHT */, &action_info);
                if (ret == EINA_FALSE) {
                        ErrPrint("Action error\n");
                }
        } else if (!strcasecmp(operation, "next,hl")) {
                action_info.highlight_cycle = (!!option) && (!!strcasecmp(option, "no,cycle"));
 
-               ret = elm_access_action(edje, ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, &action_info);
+               ret = elm_access_action(edje, 0 /* ELM_ACCESS_ACTION_HIGHLIGHT_NEXT */, &action_info);
                if (ret == EINA_FALSE) {
                        ErrPrint("Action error\n");
                }
        } else if (!strcasecmp(operation, "prev,hl")) {
                action_info.highlight_cycle = EINA_TRUE;
-               ret = elm_access_action(edje, ELM_ACCESS_ACTION_HIGHLIGHT_PREV, &action_info);
+               ret = elm_access_action(edje, 0 /* ELM_ACCESS_ACTION_HIGHLIGHT_PREV */, &action_info);
                if (ret == EINA_FALSE) {
                        ErrPrint("Action error\n");
                }
@@ -686,6 +686,8 @@ out:
 
 static inline void apply_shadow_effect(struct image_option *img_opt, Evas_Object *img)
 {
+       return;
+       /*
        ea_effect_h *ea_effect;
 
        if (!img_opt->shadow.enabled) {
@@ -702,6 +704,7 @@ static inline void apply_shadow_effect(struct image_option *img_opt, Evas_Object
        ea_object_image_effect_set(img, ea_effect);
 
        ea_image_effect_destroy(ea_effect);
+       */
 }
 
 static Evas_Object *crop_image(Evas_Object *img, const char *path, int part_w, int part_h, int w, int h, struct image_option *img_opt)
@@ -1139,7 +1142,7 @@ PUBLIC int script_feed_event(void *h, int event_type, int x, int y, int type, un
                memset(&info, 0, sizeof(info));
 
                if ((event_type & WIDGET_SCRIPT_ACCESS_HIGHLIGHT) == WIDGET_SCRIPT_ACCESS_HIGHLIGHT) {
-                       action = ELM_ACCESS_ACTION_HIGHLIGHT;
+                       action = 0; // ELM_ACCESS_ACTION_HIGHLIGHT;
                        info.x = x;
                        info.y = y;
                        ret = elm_access_action(edje, action, &info);
@@ -1157,32 +1160,32 @@ PUBLIC int script_feed_event(void *h, int event_type, int x, int y, int type, un
                                ret = WIDGET_ACCESS_STATUS_ERROR;
                        }
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_HIGHLIGHT_NEXT) == WIDGET_SCRIPT_ACCESS_HIGHLIGHT_NEXT) {
-                       action = ELM_ACCESS_ACTION_HIGHLIGHT_NEXT;
+                       action = 0; // ELM_ACCESS_ACTION_HIGHLIGHT_NEXT;
                        info.highlight_cycle = EINA_FALSE;
                        ret = elm_access_action(edje, action, &info);
                        DbgPrint("ACCESS_HIGHLIGHT_NEXT, returns %d\n", ret);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_LAST : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_HIGHLIGHT_PREV) == WIDGET_SCRIPT_ACCESS_HIGHLIGHT_PREV) {
-                       action = ELM_ACCESS_ACTION_HIGHLIGHT_PREV;
+                       action = 0; // ELM_ACCESS_ACTION_HIGHLIGHT_PREV;
                        info.highlight_cycle = EINA_FALSE;
                        ret = elm_access_action(edje, action, &info);
                        DbgPrint("ACCESS_HIGHLIGHT_PREV, returns %d\n", ret);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_FIRST : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_ACTIVATE) == WIDGET_SCRIPT_ACCESS_ACTIVATE) {
-                       action = ELM_ACCESS_ACTION_ACTIVATE;
+                       action = 0; // ELM_ACCESS_ACTION_ACTIVATE;
                        ret = elm_access_action(edje, action, &info);
                        DbgPrint("ACCESS_ACTIVATE, returns %d\n", ret);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_ACTION) == WIDGET_SCRIPT_ACCESS_ACTION) {
                        switch (type) {
                        case ACCESS_TYPE_UP:
-                               action = ELM_ACCESS_ACTION_UP;
+                               action = 0; // ELM_ACCESS_ACTION_UP;
                                ret = elm_access_action(edje, action, &info);
                                DbgPrint("ACCESS_ACTION(%d), returns %d\n", type, ret);
                                ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                                break;
                        case ACCESS_TYPE_DOWN:
-                               action = ELM_ACCESS_ACTION_DOWN;
+                               action = 0; // ELM_ACCESS_ACTION_DOWN;
                                ret = elm_access_action(edje, action, &info);
                                DbgPrint("ACCESS_ACTION(%d), returns %d\n", type, ret);
                                ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
@@ -1193,7 +1196,7 @@ PUBLIC int script_feed_event(void *h, int event_type, int x, int y, int type, un
                                break;
                        }
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_SCROLL) == WIDGET_SCRIPT_ACCESS_SCROLL) {
-                       action = ELM_ACCESS_ACTION_SCROLL;
+                       action = 0; // ELM_ACCESS_ACTION_SCROLL;
                        info.x = x;
                        info.y = y;
                        switch (type) {
@@ -1220,54 +1223,54 @@ PUBLIC int script_feed_event(void *h, int event_type, int x, int y, int type, un
                                break;
                        }
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_UNHIGHLIGHT) == WIDGET_SCRIPT_ACCESS_UNHIGHLIGHT) {
-                       action = ELM_ACCESS_ACTION_UNHIGHLIGHT;
+                       action = 0; // ELM_ACCESS_ACTION_UNHIGHLIGHT;
                        ret = elm_access_action(edje, action, &info);
                        DbgPrint("ACCESS_UNHIGHLIGHT, returns %d\n", ret);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_VALUE_CHANGE) == WIDGET_SCRIPT_ACCESS_VALUE_CHANGE) {
-                       action = ELM_ACCESS_ACTION_VALUE_CHANGE;
+                       action = 0; // ELM_ACCESS_ACTION_VALUE_CHANGE;
                        info.mouse_type = type;
                        info.x = x;
                        info.y = y;
                        ret = elm_access_action(edje, action, &info);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_MOUSE) == WIDGET_SCRIPT_ACCESS_MOUSE) {
-                       action = ELM_ACCESS_ACTION_MOUSE;
+                       action = 0; // ELM_ACCESS_ACTION_MOUSE;
                        info.mouse_type = type;
                        info.x = x;
                        info.y = y;
                        ret = elm_access_action(edje, action, &info);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_BACK) == WIDGET_SCRIPT_ACCESS_BACK) {
-                       action = ELM_ACCESS_ACTION_BACK;
+                       action = 0; // ELM_ACCESS_ACTION_BACK;
                        info.mouse_type = type;
                        info.x = x;
                        info.y = y;
                        ret = elm_access_action(edje, action, &info);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_OVER) == WIDGET_SCRIPT_ACCESS_OVER) {
-                       action = ELM_ACCESS_ACTION_OVER;
+                       action = 0; // ELM_ACCESS_ACTION_OVER;
                        info.mouse_type = type;
                        info.x = x;
                        info.y = y;
                        ret = elm_access_action(edje, action, &info);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_READ) == WIDGET_SCRIPT_ACCESS_READ) {
-                       action = ELM_ACCESS_ACTION_READ;
+                       action = 0; // ELM_ACCESS_ACTION_READ;
                        info.mouse_type = type;
                        info.x = x;
                        info.y = y;
                        ret = elm_access_action(edje, action, &info);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_ENABLE) == WIDGET_SCRIPT_ACCESS_ENABLE) {
-                       action = ELM_ACCESS_ACTION_ENABLE;
+                       action = 0; // ELM_ACCESS_ACTION_ENABLE;
                        info.mouse_type = type;
                        info.x = x;
                        info.y = y;
                        ret = elm_access_action(edje, action, &info);
                        ret = (ret == EINA_FALSE) ? WIDGET_ACCESS_STATUS_ERROR : WIDGET_ACCESS_STATUS_DONE;
                } else if ((event_type & WIDGET_SCRIPT_ACCESS_DISABLE) == WIDGET_SCRIPT_ACCESS_DISABLE) {
-                       action = ELM_ACCESS_ACTION_ENABLE;
+                       action = 0; // ELM_ACCESS_ACTION_ENABLE;
                        info.mouse_type = type;
                        info.x = x;
                        info.y = y;
@@ -2028,7 +2031,10 @@ static void font_changed_cb(keynode_t *node, void *user_data)
 {
        char *font_name;
 
+       /**
+        * @FIXME
        evas_font_reinit();
+       */
 
        if (s_info.font_name) {
                font_name = vconf_get_str("db/setting/accessibility/font_name");