summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJEONGHYUN YUN <jh0506.yun@samsung.com>2016-08-12 09:57:10 +0900
committerJEONGHYUN YUN <jh0506.yun@samsung.com>2016-08-12 09:58:10 +0900
commit0baa118598e4d1393f6eab83e96f6ace40f1dc7f (patch)
treec804e61347a60bbf733a5aa2d2cb143caf0a41dc
parent8b288f7f69282cac33d6620281628e70027c74f2 (diff)
downloadelm-demo-tizen-mobile-0baa118598e4d1393f6eab83e96f6ace40f1dc7f.tar.gz
elm-demo-tizen-mobile-0baa118598e4d1393f6eab83e96f6ace40f1dc7f.tar.bz2
elm-demo-tizen-mobile-0baa118598e4d1393f6eab83e96f6ace40f1dc7f.zip
Fix build warning
Signed-off-by: JEONGHYUN YUN <jh0506.yun@samsung.com> Change-Id: I40be608324d4787f5e91c93c609f6cd06be65564
-rw-r--r--inc/main.h2
-rw-r--r--po/en_US.po4
-rw-r--r--src/accessibility/screen_reader/reading_list.c8
-rw-r--r--src/pagecontrol_horizontal.c4
-rw-r--r--src/svg.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/inc/main.h b/inc/main.h
index 1e4161d..9750be3 100644
--- a/inc/main.h
+++ b/inc/main.h
@@ -99,5 +99,5 @@ void screen_reader_launch(void);
void screen_reader_terminate(void);
int screen_reader_vconf_status(void);
void performance_cb(void *data, Evas_Object *obj, void *event_info);
-void svg_cb(void *data);
+void svg_cb(void *data, Evas_Object *obj, void *event_info);
diff --git a/po/en_US.po b/po/en_US.po
index 8521d44..bc00f5c 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -10,11 +10,11 @@ msgstr "Tick box for the entire group"
msgid "IDS_INDEX_FASTSCROLL_DESCRIPTION"
msgstr "Alphabetical index bar, Swipe right or left with one finger to select next or previous letter"
-msgid "IDS_INDEX_PAGECONTROL_DESCRIPTION"
+msgid "Page %d of %d"
msgstr "Page %d of %d"
msgid "IDS_SLIDER_NAME"
msgstr "Slider accessiblity name"
msgid "IDS_FAVOURITE_NAME"
-msgstr "Favorite button" \ No newline at end of file
+msgstr "Favorite button"
diff --git a/src/accessibility/screen_reader/reading_list.c b/src/accessibility/screen_reader/reading_list.c
index 0dc71a9..be1669b 100644
--- a/src/accessibility/screen_reader/reading_list.c
+++ b/src/accessibility/screen_reader/reading_list.c
@@ -44,7 +44,7 @@ group_check_content_get_cb(void *data, Evas_Object *obj, const char *part)
return NULL;
}
-static Evas_Object*
+static char*
group_check_text_get_cb(void *data, Evas_Object *obj, const char *part)
{
char buf[1024];
@@ -57,7 +57,7 @@ group_check_text_get_cb(void *data, Evas_Object *obj, const char *part)
return NULL;
}
-static Evas_Object*
+static char*
group_text_get_cb(void *data, Evas_Object *obj, const char *part)
{
char buf[1024];
@@ -174,7 +174,7 @@ one_icon_content_get_cb(void *data, Evas_Object *obj, const char *part)
return NULL;
}
-static Evas_Object*
+static char*
one_icon_text_get_cb(void *data, Evas_Object *obj, const char *part)
{
char buf[1024];
@@ -234,7 +234,7 @@ type1_content_get_cb(void *data, Evas_Object *obj, const char *part)
}
-static Evas_Object*
+static char*
type1_text_get_cb(void *data, Evas_Object *obj, const char *part)
{
char buf[1024];
diff --git a/src/pagecontrol_horizontal.c b/src/pagecontrol_horizontal.c
index 192e0e9..5bf1c6f 100644
--- a/src/pagecontrol_horizontal.c
+++ b/src/pagecontrol_horizontal.c
@@ -36,7 +36,7 @@ _index_change_cb(void *data, Evas_Object *obj, void *event_info)
char buf[64] = {0,};
selected_page = (int)elm_object_item_data_get(it);
- sprintf(buf, _("IDS_INDEX_PAGECONTROL_DESCRIPTION"), selected_page + 1, pd->total_page);
+ sprintf(buf, _("Page %d of %d"), selected_page + 1, pd->total_page);
elm_atspi_accessible_description_set(pd->index, buf);
elm_atspi_accessible_translation_domain_set(pd->index, PACKAGE);
if (selected_page == pd->current_page) return;
@@ -234,7 +234,7 @@ create_index(Evas_Object *parent)
elm_index_level_go(index, 0);
elm_index_item_selected_set(it, EINA_TRUE);
- sprintf(buf, _("IDS_INDEX_PAGECONTROL_DESCRIPTION"), (int)elm_object_item_data_get(it) + 1, pd->total_page);
+ sprintf(buf, _("Page %d of %d"), (int)elm_object_item_data_get(it) + 1, pd->total_page);
elm_atspi_accessible_description_set(index, buf);
elm_atspi_accessible_translation_domain_set(index, PACKAGE);
pd->index = index;
diff --git a/src/svg.c b/src/svg.c
index 47b17c0..99f0221 100644
--- a/src/svg.c
+++ b/src/svg.c
@@ -17,7 +17,7 @@
#include "main.h"
void
-svg_cb(void *data)
+svg_cb(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *layout;
Evas_Object *nf = data;
@@ -28,4 +28,4 @@ svg_cb(void *data)
evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(layout);
elm_naviframe_item_push(nf, "Svg", NULL, NULL, layout, NULL);
-} \ No newline at end of file
+}