summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Dolzhenko <d.dolzhenko@samsung.com>2017-08-08 13:43:48 +0300
committerDenis Dolzhenko <d.dolzhenko@samsung.com>2017-08-08 13:43:48 +0300
commitf4356227b6ec1ae0aba7a3e398b427734c32b79b (patch)
treec08ec2c4dadfb728d3850b9d0733a593e480b17f
parentbf592520ac4f307e0baeb2c3164f020cbecf5ec4 (diff)
downloadtimer-f4356227b6ec1ae0aba7a3e398b427734c32b79b.tar.gz
timer-f4356227b6ec1ae0aba7a3e398b427734c32b79b.tar.bz2
timer-f4356227b6ec1ae0aba7a3e398b427734c32b79b.zip
Change-Id: I85e74d3898653433de69bf848913ce3892275d88 Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>
-rwxr-xr-xtimer_alert/src/ring.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/timer_alert/src/ring.c b/timer_alert/src/ring.c
index 970edeb..f04063d 100755
--- a/timer_alert/src/ring.c
+++ b/timer_alert/src/ring.c
@@ -89,23 +89,6 @@ win_delete_request_cb(void *data, Evas_Object *obj, void *event_info)
}
/*
-* @brief: untility function to append app resource path for edje file
-* @param[edj_file_in]: in, edje file name
-* @param[edj_path_out]: out, complete edje file path with app resource path.
-* @param[edj_path_max]: in, max length of the path.
-*/
-static void
-app_get_resource(const char *edj_file_in, char *edj_path_out, int edj_path_max)
-{
- _TMR_ENTER_;
- char *res_path = app_get_resource_path();
- if (res_path) {
- snprintf(edj_path_out, edj_path_max, "%s%s", res_path, edj_file_in);
- free(res_path);
- }
-}
-
-/*
* @brief: callback function to attached to key press event
* @param[data]: in, app data/ user data
* @param[obj]: in, object which is generated key press event
@@ -616,7 +599,7 @@ void _screen_reader_objects_create(void* data)
char buf[256] = { 0, };
//create icon
- icon = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_dismiss), "drag_item_dismiss"), ad->ly_dismiss);
+ icon = elm_access_object_register((Evas_Object*)edje_object_part_object_get(_EDJ(ad->ly_dismiss), "drag_item_dismiss"), ad->ly_dismiss);
snprintf(buf, sizeof(buf), "%s", S_(STRING_TMR_CANCEL));
elm_atspi_accessible_name_set(icon, buf);
snprintf(buf, sizeof(buf), "%s", S_(STRING_TTS_TMR_SWIPE_RIGHT_TO_DISMISS));
@@ -626,14 +609,14 @@ void _screen_reader_objects_create(void* data)
elm_access_action_cb_set(icon, ELM_ACCESS_ACTION_SCROLL, _screen_reader_dismiss_button_scroll, ad);
//create time text
- elapse_time = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "time"), ad->ly_main);
+ elapse_time = elm_access_object_register((Evas_Object*)edje_object_part_object_get(_EDJ(ad->ly_main), "time"), ad->ly_main);
ad->elapse_time = elapse_time;
elm_atspi_accessible_reading_info_type_set(elapse_time, ELM_ACCESSIBLE_READING_INFO_TYPE_DESCRIPTION);
elm_atspi_accessible_description_cb_set(elapse_time, _time_atspi_cb, ad);
elm_atspi_accessible_translation_domain_set(elapse_time, PACKAGE);
//create timeup
- timeupstr = elm_access_object_register(edje_object_part_object_get(_EDJ(ad->ly_main), "text"), ad->ly_main);
+ timeupstr = elm_access_object_register((Evas_Object*)edje_object_part_object_get(_EDJ(ad->ly_main), "text"), ad->ly_main);
snprintf(buf, sizeof(buf), "%s", S_(STRING_TIMER_TIME_IS_UP));
elm_atspi_accessible_name_set(timeupstr, buf);
elm_atspi_accessible_translation_domain_set(timeupstr, PACKAGE);