static void mouseup_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Up *ev = event_info;
- if (ev->button == 3) {
+ if (ev->button == 3)
evas_object_del(obj);
- }
}
/*static void keydown_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
wfd_appdata_t *ad = wfd_get_appdata();
wfd_connection_info_s *connection = ad->connection;
int result = -1;
- int resp = (int) data;
+ unsigned long int resp = (unsigned long int) data;
char msg[WFD_POP_STR_MAX_LEN] = {0};
+ char *format_str = NULL;
WFD_APP_LOG(WFD_APP_LOG_HIGH, "popup resp : %d\n", resp);
evas_object_hide(ad->win);
/* tickernoti popup */
- snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
- connection->peer_name);
+ format_str = D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS");
+ snprintf(msg, WFD_POP_STR_MAX_LEN, format_str, connection->peer_name);
notification_status_message_post(msg);
}
WFD_APP_LOG(WFD_APP_LOG_LOW, "Succeeded to accept connection");
WFD_APP_LOG(WFD_APP_LOG_LOW,
"wifi_direct_accept_connection() failed. result=[%d]\n", result);
/* tickernoti popup */
- notification_status_message_post(_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"));
+ notification_status_message_post(D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"));
}
}
break;
WFD_APP_LOG(WFD_APP_LOG_ERROR, "Error, Incorrect PIN!!\n");
keypad_popup_timeout--;
/* tickernoti popup */
- notification_status_message_post(_("IDS_COM_BODY_PINS_DO_NOT_MATCH"));
+ notification_status_message_post(D_("IDS_COM_BODY_PINS_DO_NOT_MATCH"));
/* redraw the popup */
wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_KEYPAD, (void *) NULL);
result = wifi_direct_set_wps_pin(connection->wps_pin);
if (result != WIFI_DIRECT_ERROR_NONE) {
/* tickernoti popup */
- snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
- connection->peer_name);
+ format_str = D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS");
+ snprintf(msg, WFD_POP_STR_MAX_LEN, format_str, connection->peer_name);
notification_status_message_post(msg);
return;
}
evas_object_hide(ad->win);
/* tickernoti popup */
- snprintf(msg, WFD_POP_STR_MAX_LEN, _("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS"),
- connection->peer_name);
+ format_str = D_("IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS");
+ snprintf(msg, WFD_POP_STR_MAX_LEN, format_str, connection->peer_name);
notification_status_message_post(msg);
}
WFD_APP_LOG(WFD_APP_LOG_LOW, "Succeeded to connect with [%s]", connection->peer_addr);
ad->popup_timeout_handle = 0;
}
- if (ad->win) {
+ if (ad->win)
evas_object_hide(ad->win);
- }
if (pb_timer) {
ecore_timer_del(pb_timer);
popup = elm_popup_add(win);
elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
- eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) (intptr_t) pop->resp_data1);
evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad);
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_style_set(btn, "popup");
elm_object_domain_translatable_text_set(btn, PACKAGE, pop->label1);
elm_object_part_content_set(popup, "button1", btn);
- evas_object_smart_callback_add(btn, "clicked", __popup_resp_cb, (void *) pop->resp_data1);
+ evas_object_smart_callback_add(btn, "clicked", __popup_resp_cb, (void *) (intptr_t) pop->resp_data1);
evas_object_show(popup);
evas_object_show(win);
popup = elm_popup_add(win);
elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
- eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) (intptr_t) pop->resp_data2);
evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP, mouseup_cb, ad);
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_domain_translatable_part_text_set(popup, "title,text",
- PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
+ PACKAGE, D_("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
elm_object_domain_translatable_text_set(popup, PACKAGE, pop->text);
btn1 = elm_button_add(popup);
elm_object_domain_translatable_text_set(btn1, PACKAGE, pop->label2);
elm_object_part_content_set(popup, "button1", btn1);
evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb,
- (void *) pop->resp_data2);
+ (void *) (intptr_t) pop->resp_data2);
btn2 = elm_button_add(popup);
elm_object_style_set(btn2, "popup");
elm_object_domain_translatable_text_set(btn2, PACKAGE, pop->label1);
elm_object_part_content_set(popup, "button2", btn2);
evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb,
- (void *) pop->resp_data1);
+ (void *) (intptr_t) pop->resp_data1);
evas_object_show(popup);
evas_object_show(win);
ad->popup = NULL;
}
- if (ad->win) {
+ if (ad->win)
evas_object_hide(ad->win);
- }
__WFD_APP_FUNC_EXIT__;
}
Evas_Object *popup = NULL;
Evas_Object *btn = NULL;
char popup_text[MAX_POPUP_TEXT_SIZE] = {0};
+ char *format_str = NULL;
wfd_appdata_t *ad = wfd_get_appdata();
popup = elm_popup_add(win);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_domain_translatable_part_text_set(popup, "title,text",
PACKAGE, "IDS_WIFI_BODY_WI_FI_DIRECT_ABB");
- snprintf(popup_text, MAX_POPUP_TEXT_SIZE,
- "IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG", 5);
+ format_str = D_("IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG");
+ snprintf(popup_text, MAX_POPUP_TEXT_SIZE, format_str, 5);
elm_object_domain_translatable_text_set(popup, PACKAGE, popup_text);
btn = elm_button_add(popup);
/* show the time label */
if (step < 60) {
- if (step < 10) {
+ if (step < 10)
snprintf(time_label, 32, "00:0%d", step);
- } else {
+ else
snprintf(time_label, 32, "00:%d", step);
- }
} else {
- if (step%60 < 10) {
+ if (step%60 < 10)
snprintf(time_label, 32, "0%d:0%d", step/60, step%60);
- } else {
+ else
snprintf(time_label, 32, "0%d:%d", step/60, step%60);
- }
}
char *remaining_time_str = g_strdup_printf(
char msg1[WFD_POP_STR_MAX_LEN] = {0};
char msg2[WFD_POP_STR_MAX_LEN] = {0};
char label_str[WFD_POP_STR_MAX_LEN] = {0, };
+ char * format_str = NULL;
Evas_Object *label = (Evas_Object*) data;
wfd_appdata_t *ad = wfd_get_appdata();
- wfd_connection_info_s *connection = ad->connection;
+ wfd_connection_info_s *connection = NULL;
+
WFD_RETV_IF(NULL == ad, FALSE, "NULL parameters(ad)\n");
WFD_RETV_IF(NULL == label, FALSE, "NULL parameters(label)\n");
if (NULL == ad->popup) {
return ECORE_CALLBACK_CANCEL;
}
- keypad_popup_timeout --;
+ connection = ad->connection;
+
+ keypad_popup_timeout--;
if (keypad_popup_timeout > 0) {
_replace_1PS_2PD((char *)msg1, sizeof(msg1),
- _("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
+ D_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, keypad_popup_timeout);
- snprintf(msg2, sizeof(msg2), _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
- connection->peer_name);
+ format_str = D_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS");
+ snprintf(msg2, sizeof(msg2), format_str, connection->peer_name);
snprintf(label_str, sizeof(label_str), "%s %s", msg1, msg2);
elm_object_domain_translatable_text_set(label, PACKAGE, label_str);
* @param[in] title the pointer to the title of edit field
* @param[in] guide the pointer to the text of guide
* @param[in] single_line whether it can support single line
- * @param[in] is_editable whether it is avaliable to edit
+ * @param[in] is_editable whether it is available to edit
*/
/*static Evas_Object *_add_edit_field(Evas_Object *parent, const char *title, const char *guide, Eina_Bool single_line, Eina_Bool is_editable)
{
// evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, keydown_cb, ad);
evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, 0.0);
elm_object_domain_translatable_part_text_set(popup, "title,text",
- PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
+ PACKAGE, D_("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
layout = elm_layout_add(popup);
if (layout == NULL) {
/* add time */
time = elm_label_add(layout);
elm_label_line_wrap_set(time, ELM_WRAP_MIXED);
- elm_object_text_set(time, _("<font_size=40><align=center>00:00</align></font_size>"));
+ elm_object_text_set(time,
D_("<font_size=40><align=center>00:00</align></font_size>"));
evas_object_size_hint_weight_set(time, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(time, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(time);
elm_object_domain_translatable_text_set(btn2, PACKAGE, pop->label2);
elm_object_part_content_set(popup, "button1", btn2);
evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb,
- (void *) pop->resp_data2);
- eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data2);
+ (void *) (intptr_t) pop->resp_data2);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb,
+ (void *) (intptr_t) pop->resp_data2);
}
- if (pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES || pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_PBC_YES ) {
+ if (pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES || pop->resp_data1 == WFD_POP_RESP_APRV_CONNECT_PBC_YES) {
Evas_Object *btn1 = NULL;
btn1 = elm_button_add(popup);
elm_object_style_set(btn1, "popup");
elm_object_domain_translatable_text_set(btn1, PACKAGE, pop->label1);
elm_object_part_content_set(popup, "button2", btn1);
evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb,
- (void *) pop->resp_data1);
- eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb, (void *) pop->resp_data1);
+ (void *) (intptr_t) pop->resp_data1);
+ eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __popup_resp_cb,
+ (void *) (intptr_t) pop->resp_data1);
}
elm_object_content_set(popup, layout);
Ecore_IMF_Context *imf_context;
imf_context = (Ecore_IMF_Context*)elm_entry_imf_context_get(entry);
- if (imf_context) {
+ if (imf_context)
ecore_imf_context_input_panel_hide(imf_context);
- }
elm_object_focus_set(entry, EINA_FALSE);
}
const char *part)
{
__WFD_APP_FUNC_ENTER__;
- if (obj == NULL || part == NULL) {
+ if (obj == NULL || part == NULL)
return NULL;
- }
+
WFD_APP_LOG(WFD_APP_LOG_LOW, "wfd_rename desc\n");
char buf[WFD_POP_STR_MAX_LEN] = {0, };
char msg1[WFD_POP_STR_MAX_LEN] = {0, };
char msg2[WFD_POP_STR_MAX_LEN] = {0, };
+ char *format_str = NULL;
wfd_appdata_t *ad = wfd_get_appdata();
WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n");
wfd_connection_info_s *connection = ad->connection;
WFD_RETV_IF(connection == NULL, NULL, "Incorrect parameter(NULL)\n");
if (!strcmp("elm.text.multiline", part)) {
- if (keypad_popup_timeout > 0) {
+ if (keypad_popup_timeout > 0)
ad->timeout = keypad_popup_timeout;
- }
+
_replace_1PS_2PD((char *)msg1, WFD_POP_STR_MAX_LEN,
- _("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
+ D_("IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB"),
connection->peer_name, ad->timeout);
- snprintf(msg2, WFD_POP_STR_MAX_LEN,
- _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"),
- connection->peer_name);
+ format_str = D_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS");
+ snprintf(msg2, WFD_POP_STR_MAX_LEN, format_str, connection->peer_name);
WFD_APP_LOG(WFD_APP_LOG_LOW, "string %s %s", msg1, msg2);
snprintf(buf, WFD_POP_STR_MAX_LEN,
const char *part)
{
__WFD_APP_FUNC_ENTER__;
- if (obj == NULL || part == NULL) {
+ if (obj == NULL || part == NULL)
return NULL;
- }
+
wfd_appdata_t *ad = wfd_get_appdata();
WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n");
Evas_Object *entry = NULL;
elm_entry_prediction_allow_set(entry, EINA_FALSE);
elm_entry_markup_filter_append(entry,
- elm_entry_filter_accept_set,&accept_set);
+ elm_entry_filter_accept_set, &accept_set);
elm_entry_input_panel_layout_set(entry,
ELM_INPUT_PANEL_LAYOUT_DATETIME);
elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
elm_object_domain_translatable_part_text_set(entry, "elm.guide",
- PACKAGE, _("IDS_WIFI_POP_PIN"));
- elm_entry_input_panel_return_key_autoenabled_set(entry,EINA_TRUE);
+ PACKAGE, D_("IDS_WIFI_POP_PIN"));
+ elm_entry_input_panel_return_key_autoenabled_set(entry, EINA_TRUE);
elm_entry_input_panel_return_key_type_set(entry,
ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
evas_object_smart_callback_add(button, "clicked",
__popup_eraser_clicked_cb, entry);
- elm_object_signal_emit (entry, "elm,action,hide,search_icon", "");
+ elm_object_signal_emit(entry, "elm,action,hide,search_icon", "");
evas_object_smart_callback_add(entry, "changed",
_entry_changed_cb, NULL);
evas_object_smart_callback_add(entry, "preedit,changed",
evas_object_event_callback_add(entry, EVAS_CALLBACK_KEY_DOWN,
_entry_keydown_cb, ad);
- elm_object_content_set(obj,entry);
+ elm_object_content_set(obj, entry);
evas_object_show(entry);
evas_object_smart_callback_add(entry, "changed", _smart_ime_cb, NULL);
elm_object_focus_set(entry, EINA_TRUE);
static void _chk_changed_cb(void *data, Evas_Object *obj, void *ei)
{
__WFD_APP_FUNC_ENTER__;
- if (obj == NULL || data == NULL) {
+ if (obj == NULL || data == NULL)
return;
- }
+
Eina_Bool state = elm_check_state_get(obj);
- if (state) {
+ if (state)
elm_entry_password_set((Evas_Object *)data, EINA_FALSE);
- } else {
+ else
elm_entry_password_set((Evas_Object *)data, EINA_TRUE);
- }
+
__WFD_APP_FUNC_EXIT__;
}
__WFD_APP_FUNC_ENTER__;
Elm_Object_Item *item = NULL;
item = (Elm_Object_Item *)ei;
- if (item == NULL) {
+ if (item == NULL)
return;
- }
+
wfd_appdata_t *ad = wfd_get_appdata();
if (ad == NULL) {
WFD_APP_LOG(WFD_APP_LOG_LOW, "Incorrect parameter(NULL)\n");
elm_genlist_item_selected_set(item, EINA_FALSE);
Eina_Bool state = elm_check_state_get(ck);
elm_check_state_set(ck, !state);
- if (ad) {
- _chk_changed_cb(ad->pin_entry, ck, NULL);
- }
+ _chk_changed_cb(ad->pin_entry, ck, NULL);
+
__WFD_APP_FUNC_EXIT__;
}
{
__WFD_APP_FUNC_ENTER__;
- if (data == NULL || part == NULL) {
+ if (data == NULL || part == NULL)
return NULL;
- }
+
WFD_APP_LOG(WFD_APP_LOG_LOW, "Part %s", part);
if (!strcmp("elm.text", part)) {
const char *part)
{
__WFD_APP_FUNC_ENTER__;
- if (obj == NULL || part == NULL) {
+ if (obj == NULL || part == NULL)
return NULL;
- }
+
wfd_appdata_t *ad = wfd_get_appdata();
WFD_RETV_IF(ad == NULL, NULL, "Incorrect parameter(NULL)\n");
Evas_Object *check = NULL;
NULL);
evas_object_size_hint_weight_set(pinpopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_domain_translatable_part_text_set(pinpopup, "title,text",
- PACKAGE, _("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
+ PACKAGE, D_("IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB"));
genlist = elm_genlist_add(pinpopup);
elm_genlist_homogeneous_set(genlist, EINA_TRUE);
/* Entry genlist item */
ad->pin_desc_itc = elm_genlist_item_class_new();
- if(ad->pin_desc_itc != NULL) {
+ if (ad->pin_desc_itc != NULL) {
ad->pin_desc_itc->item_style = WFD_GENLIST_MULTILINE_TEXT_STYLE;
ad->pin_desc_itc->func.text_get = __wfd_main_desc_label_get;
ad->pin_desc_itc->func.content_get = NULL;
git = elm_genlist_item_append(genlist, ad->pin_desc_itc, ad, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
- if(git != NULL)
+ if (git != NULL)
elm_genlist_item_select_mode_set(git,
ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
}
ad->pin_entry_itc = elm_genlist_item_class_new();
- if(ad->pin_entry_itc != NULL) {
+ if (ad->pin_entry_itc != NULL) {
ad->pin_entry_itc->item_style = "entry";
ad->pin_entry_itc->func.text_get = NULL;
ad->pin_entry_itc->func.content_get = __wfd_pin_entry_icon_get;
}
ad->paswd_itc = elm_genlist_item_class_new();
- if(ad->paswd_itc != NULL) {
+ if (ad->paswd_itc != NULL) {
ad->paswd_itc->item_style = WFD_GENLIST_1LINE_TEXT_ICON_STYLE;
ad->paswd_itc->func.text_get = __wfd_password_label;
ad->paswd_itc->func.content_get = __wfd_password_check;
ad->paswd_itc->func.del = NULL;
elm_genlist_item_append(genlist, ad->paswd_itc, pinpopup,
- NULL, ELM_GENLIST_ITEM_NONE, _gl_pswd_check_box_sel, (void *)ad );
+ NULL, ELM_GENLIST_ITEM_NONE, _gl_pswd_check_box_sel, (void *)ad);
}
btn1 = elm_button_add(pinpopup);
elm_object_domain_translatable_text_set(btn1, PACKAGE, pop->label2);
elm_object_part_content_set(pinpopup, "button1", btn1);
evas_object_smart_callback_add(btn1, "clicked", __popup_resp_cb,
- (void *)pop->resp_data2);
+ (void *) (intptr_t) pop->resp_data2);
btn2 = elm_button_add(pinpopup);
elm_object_style_set(btn2, "popup");
elm_object_domain_translatable_text_set(btn2, PACKAGE, pop->label1);
elm_object_part_content_set(pinpopup, "button2", btn2);
evas_object_smart_callback_add(btn2, "clicked", __popup_resp_cb,
- (void *)pop->resp_data1);
+ (void *) (intptr_t) pop->resp_data1);
#if defined(GENLIST_REALIZATION_MOTE_SET)
elm_genlist_realization_mode_set(genlist, EINA_TRUE);
#endif
buf = g_strdup(haystack);
p = strstr(buf, niddle);
- if (p==NULL) {
+ if (p == NULL) {
free(buf);
return;
}
char text1[WFD_POP_STR_MAX_LEN+1] = {0, };
wfd_destroy_popup();
char *peer_name;
+ char *format_str = NULL;
+
peer_name = elm_entry_utf8_to_markup(connection->peer_name);
memset(pop, 0, sizeof(wfd_popup_t));
case /* MT */ WFD_POP_APRV_CONNECTION_WPS_PUSHBUTTON_REQ:
_replace_1PS_2PD((char *)pop->text, sizeof(pop->text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_SK2_OK"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_WIFI_SK_CANCEL"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_WIFI_SK2_OK"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_WIFI_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_PBC_YES;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
ad->popup = wfd_draw_pop_type_display(ad->win, pop);
- break;
+ break;
case /* MT */ WFD_POP_APRV_CONNECTION_WPS_DISPLAY_REQ:
- snprintf(pop->text, sizeof(pop->text),
- _("IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q"),
- peer_name);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_BUTTON_ALLOW"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ format_str = D_("IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q");
+ snprintf(pop->text, sizeof(pop->text), format_str, peer_name);
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_WIFI_BUTTON_ALLOW"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_DISPLAY_OK;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
ad->popup = wfd_draw_pop_type_c(ad->win, pop);
- break;
+ break;
case /* MT */ WFD_POP_APRV_CONNECTION_WPS_KEYPAD_REQ:
_replace_1PS_2PD((char *)pop->text, sizeof(pop->text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_BR_SK_OK"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_BR_SK_OK"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_KEYPAD_YES;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
ad->popup = wfd_draw_pop_type_display(ad->win, pop);
- break;
+ break;
case /* MT */ WFD_POP_PROG_CONNECT:
- snprintf(pop->text, sizeof(pop->text), "%s", _("IDS_WIFI_BODY_CONNECTING_ING"));
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->text, sizeof(pop->text), "%s", D_("IDS_WIFI_BODY_CONNECTING_ING"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_APRV_CONNECT_NO;
ad->popup = wfd_draw_pop_type_b(ad->win, pop);
- break;
+ break;
case /* MO */ WFD_POP_PROG_CONNECT_WITH_KEYPAD:
_replace_1PS_2PD((char *)text, sizeof(text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s",
- text, _("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"));
+ text, D_("IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS"));
snprintf(pop->text, sizeof(pop->text), text1, connection->peer_name);
- snprintf(pop->label1, sizeof(pop->label1), "%s", _("IDS_WIFI_SK_CONNECT"));
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->label1, sizeof(pop->label1), "%s", D_("IDS_WIFI_SK_CONNECT"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data1 = WFD_POP_RESP_PROG_CONNECT_KEYPAD_OK;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
ad->popup = wfd_draw_pop_type_keypad(ad->win, pop);
- break;
+ break;
case /* MO/MT */ WFD_POP_PROG_CONNECT_WITH_PIN:
_replace_1PS_2PD((char *)text, sizeof(text),
- _("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
+ D_("IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS"),
peer_name, WFD_POP_TIMER_120);
snprintf(text1, WFD_POP_STR_MAX_LEN, "%s %s %s",
text,
"<br>",
- _("IDS_WIFI_POP_PIN_CODE_PS"));
+ D_("IDS_WIFI_POP_PIN_CODE_PS"));
snprintf(pop->text, sizeof(pop->text), text1, connection->wps_pin);
- snprintf(pop->label2, sizeof(pop->label2), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->label2, sizeof(pop->label2), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
pop->resp_data2 = WFD_POP_RESP_APRV_CONNECT_NO;
ad->popup = wfd_draw_pop_type_display(ad->win, pop);
- break;
+ break;
case WFD_POP_PROG_CONNECT_CANCEL:
- snprintf(pop->text, sizeof(pop->text), "%s", _("IDS_BR_SK_CANCEL"));
+ snprintf(pop->text, sizeof(pop->text), "%s", D_("IDS_BR_SK_CANCEL"));
pop->timeout = WFD_POP_TIMER_120;
ad->popup = wfd_draw_pop_type_a(ad->win, pop);
- break;
+ break;
default:
break;
/* feedback play */
int ret = -1;
ret = feedback_play(FEEDBACK_PATTERN_GENERAL);
- if (ret != FEEDBACK_ERROR_NONE) {
- WFD_APP_LOG(WFD_APP_LOG_ERROR,"feedback_play error : %d\n", ret);
- }
+ if (ret != FEEDBACK_ERROR_NONE)
+ WFD_APP_LOG(WFD_APP_LOG_ERROR, "feedback_play error : %d\n", ret);
+
WFD_IF_FREE_MEM(peer_name);
__WFD_APP_FUNC_EXIT__;
return;
projects / apps / native / ug-wifi-direct.git / blobdiff