From e2aac643173828dbbc3022684c2adaa23e9c65c0 Mon Sep 17 00:00:00 2001 From: Kim Gibyoung Date: Wed, 23 Jan 2013 10:32:41 +0900 Subject: Keypad and display popup is changed Change-Id: I2788c8875c534093460f3b80b61f575a2c249aa8 --- debian/changelog | 8 ++++++++ packaging/libug-setting-wifidirect-efl.spec | 2 +- popup-wifidirect/src/wfd-app-client.c | 8 ++++---- popup-wifidirect/src/wfd-app-popup-view.c | 2 +- ug-wifidirect/include/wfd_ug.h | 2 +- ug-wifidirect/src/wfd_client.c | 2 ++ 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index cde7af4..c214191 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ug-setting-wifidirect-efl (1.0.3) precise; urgency=low + + * Keypad and display popup is changed + * Git: rsa/apps/home/ug-wifi-direct + * Tag: libug-setting-wifidirect-efl_1.0.3 + + -- Gibyoung Kim Tue, 22 Jan 2013 21:15:28 +0900 + ug-setting-wifidirect-efl (1.0.2) precise; urgency=low * DLog macro is changed diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec index 85b4bb6..e281c10 100755 --- a/packaging/libug-setting-wifidirect-efl.spec +++ b/packaging/libug-setting-wifidirect-efl.spec @@ -3,7 +3,7 @@ Name: libug-setting-wifidirect-efl Summary: Wi-Fi Direct setting UI gadget -Version: 1.0.2 +Version: 1.0.3 Release: 1 Group: TO_BE_FILLED License: Samsung Proprietary License diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c index 41e258b..247da0e 100755 --- a/popup-wifidirect/src/wfd-app-client.c +++ b/popup-wifidirect/src/wfd-app-client.c @@ -547,9 +547,9 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st if (wps_mode == WIFI_DIRECT_WPS_TYPE_PBC) { WDPOP_LOGD( "wps_config is WIFI_DIRECT_WPS_TYPE_PBC. Ignore it..\n"); - } else if (wps_mode == WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD) { + } else if (wps_mode == WIFI_DIRECT_WPS_TYPE_PIN_DISPLAY) { char *pin; - WDPOP_LOGD( "wps_config is WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD\n"); + WDPOP_LOGD( "wps_config is WIFI_DIRECT_WPS_TYPE_PIN_DISPLAY\n"); if (wifi_direct_generate_wps_pin() != WIFI_DIRECT_ERROR_NONE) { WDPOP_LOGD( "wifi_direct_generate_wps_pin() is failed\n"); @@ -568,8 +568,8 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st WDPOP_LOGD( "pin=[%s]\n", ad->pin_number); wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_PIN, NULL); - } else if (wps_mode == WIFI_DIRECT_WPS_TYPE_PIN_DISPLAY) { - WDPOP_LOGD( "wps_config is WIFI_DIRECT_WPS_TYPE_PIN_DISPLAY\n"); + } else if (wps_mode == WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD) { + WDPOP_LOGD( "wps_config is WIFI_DIRECT_WPS_TYPE_PIN_KEYPAD\n"); wfd_prepare_popup(WFD_POP_PROG_CONNECT_WITH_KEYPAD, (void *) NULL); } else { WDPOP_LOGD( "wps_config is unkown!\n"); diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c index a754170..d231ecc 100755 --- a/popup-wifidirect/src/wfd-app-popup-view.c +++ b/popup-wifidirect/src/wfd-app-popup-view.c @@ -742,7 +742,7 @@ void wfd_prepare_popup(int type, void *userdata) 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); + ad->popup = wfd_draw_pop_type_c(ad->win, pop); break; case /* MT */ WFD_POP_PROG_CONNECT: diff --git a/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h index ff16f49..43b3b76 100755 --- a/ug-wifidirect/include/wfd_ug.h +++ b/ug-wifidirect/include/wfd_ug.h @@ -29,7 +29,7 @@ #define LOCALEDIR "/usr/ug/res/locale" #define VCONF_WFD_APNAME "db/setting/device_name" -#ifdef USE_DLOG +#ifdef USG_DLOG #include #undef LOG_TAG diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c index b344cb3..60092bb 100755 --- a/ug-wifidirect/src/wfd_client.c +++ b/ug-wifidirect/src/wfd_client.c @@ -607,6 +607,8 @@ bool _wfd_connected_peer_cb(wifi_direct_connected_peer_info_s *peer, void *user_ WDUG_LOGI("\tStatus: [%d]\n", ugd->raw_connected_peers[peer_cnt].conn_status); WDUG_LOGI("\tCategory: [%d]\n", ugd->raw_connected_peers[peer_cnt].category); WDUG_LOGI("\tSSID: [%s]\n", ugd->raw_connected_peers[peer_cnt].ssid); + WDUG_LOGI("\tMAC addr: [" MACSTR "]\n", ugd->raw_connected_peers[peer_cnt].mac_addr); + WDUG_LOGI("\tIface addr: [" MACSTR "]\n", ugd->raw_connected_peers[peer_cnt].if_addr); ugd->raw_connected_peer_cnt++; -- cgit v1.2.3