Fix build warnings

Change-Id: Ibf14f7ec395ae9a85bd614f8d524c4ce09c0531a
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/option.cpp b/src/option.cpp
index d19c057..fce5639 100644 (file)
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -155,8 +155,10 @@ static void check_sound_change_callback(void *data, Evas_Object *obj, void *even
 static void check_vibration_change_callback(void *data, Evas_Object *obj, void *event_info);
 static void check_character_pre_change_callback(void *data, Evas_Object *obj, void *event_info);
 
+#ifdef _CIRCLE
 static char* _accessible_body_name_cb(void *data, Evas_Object *obj);
-static void* _screen_reader_information_set(Evas_Object *obj);
+static void _screen_reader_information_set(Evas_Object *obj);
+#endif
 
 std::vector<ILanguageOption*> LanguageOptionManager::language_option_vector;
 void LanguageOptionManager::add_language_option(ILanguageOption *language_option) {
@@ -227,6 +229,9 @@ static Evas_Object *create_popup_button(Evas_Object *parent, const char *style,
     evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     elm_object_part_content_set(btn, "elm.swallow.content", icon);
     evas_object_show(icon);
+
+    elm_atspi_accessible_name_set(btn, string);
+    elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
 #else
     elm_object_style_set(btn, "popup");
     elm_object_domain_translatable_text_set(btn, PACKAGE, string);
@@ -235,6 +240,7 @@ static Evas_Object *create_popup_button(Evas_Object *parent, const char *style,
     return btn;
 }
 
+#ifdef _CIRCLE
 static char*
 _accessible_body_name_cb(void *data, Evas_Object *obj)
 {
@@ -242,7 +248,7 @@ _accessible_body_name_cb(void *data, Evas_Object *obj)
     return strdup(elm_object_part_text_get(layout, "elm.text"));
 }
 
-static void*
+static void
 _screen_reader_information_set(Evas_Object *obj)
 {
     Evas_Object *to, *ao;
@@ -253,6 +259,7 @@ _screen_reader_information_set(Evas_Object *obj)
         elm_atspi_accessible_reading_info_type_set(ao, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
     }
 }
+#endif
 
 static void reset_settings_popup(void *data, Evas_Object *obj, void *event_info)
 {
@@ -283,8 +290,6 @@ static void reset_settings_popup(void *data, Evas_Object *obj, void *event_info)
     icon_path = ICON_DIR"/tw_ic_popup_btn_delete.png";
 #endif
     Evas_Object *btn_cancel = create_popup_button(popup, "popup/circle/left", icon_path, POPUP_CANCEL_BTN);
-    elm_atspi_accessible_name_set(btn_cancel, POPUP_CANCEL_BTN);
-    elm_atspi_accessible_translation_domain_set(btn_cancel, PACKAGE);
     elm_object_part_content_set(popup, "button1", btn_cancel);
     evas_object_smart_callback_add(btn_cancel, "clicked", reset_settings_popup_response_cancel_cb, popup);
 
@@ -294,8 +299,6 @@ static void reset_settings_popup(void *data, Evas_Object *obj, void *event_info)
 #endif
     Evas_Object *btn_ok = create_popup_button(popup, "popup/circle/right", icon_path, POPUP_OK_BTN);
     evas_object_data_set(btn_ok, "parent_genlist", obj);
-    elm_atspi_accessible_name_set(btn_ok, POPUP_OK_BTN);
-    elm_atspi_accessible_translation_domain_set(btn_ok, PACKAGE);
     elm_object_part_content_set(popup, "button2", btn_ok);
     evas_object_smart_callback_add(btn_ok, "clicked", reset_settings_popup_response_ok_cb, popup);
     evas_object_show(popup);