Tizen directory path migration

[apps/native/ug-wifi-direct.git] / ug-wifidirect / src / wfd_client.c

diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index c25f085..9f34b68 100644 (file)
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -30,8 +30,6 @@
 #include <network-cm-intf.h>
 #include <network-wifi-intf.h>
 
-#include <wifi-direct.h>
-
 #include "wfd_ug.h"
 #include "wfd_ug_view.h"
 #include "wfd_client.h"
@@ -425,9 +423,9 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi
                if (error_code != WIFI_DIRECT_ERROR_NONE) {
                        DBG(LOG_ERROR, "Error in Activation/Deactivation [%d]\n", error_code);
                        if (WIFI_DIRECT_ERROR_AUTH_FAILED == error_code) {
-                               wfd_ug_warn_popup(ugd, _("IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"), POPUP_TYPE_ACTIVATE_FAIL_POLICY_RESTRICTS);
+                               wfd_ug_warn_popup(ugd, D_("IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI"), POPUP_TYPE_ACTIVATE_FAIL_POLICY_RESTRICTS);
                        } else {
-                               wfd_ug_warn_popup(ugd, _("IDS_COM_POP_FAILED"), POPUP_TYPE_ACTIVATE_FAIL);
+                               wfd_ug_warn_popup(ugd, D_("IDS_COM_POP_FAILED"), POPUP_TYPE_ACTIVATE_FAIL);
                        }
 
 #ifdef WFD_ON_OFF_GENLIST
@@ -469,7 +467,7 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi
                DBG(LOG_INFO, "WIFI_DIRECT_DEVICE_STATE_DEACTIVATED\n");
                if (error_code != WIFI_DIRECT_ERROR_NONE) {
                        DBG(LOG_ERROR, "Error in Activation/Deactivation [%d]\n", error_code);
-                       wfd_ug_warn_popup(ugd, _("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_DEACTIVATE_FAIL);
+                       wfd_ug_warn_popup(ugd, D_("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_DEACTIVATE_FAIL);
 #ifdef WFD_ON_OFF_GENLIST
                        ugd->wfd_onoff = 1;
                        wfd_ug_refresh_on_off_check(ugd);
@@ -489,11 +487,10 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi
                 */
                if (ugd->disconnect_btn) {
                        Evas_Object *content;
-                       content = elm_object_part_content_unset(ugd->layout, "button.next");
+                       content = elm_object_part_content_unset(ugd->button_layout, "button.next");
                        WFD_IF_DEL_OBJ(content);
                        ugd->disconnect_btn = NULL;
-                       elm_object_part_content_set(ugd->layout, "button.big",
-                       ugd->scan_toolbar);
+                       elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar);
                }
 
                /* When connect is on ongoing and deactivte happened refresh scan */
@@ -561,7 +558,7 @@ void _activation_cb(int error_code, wifi_direct_device_state_e device_state, voi
        }
 
        /*if (ugd->scan_toolbar) {
-               wfd_ug_view_refresh_button(ugd->scan_toolbar, _("IDS_WIFI_SK4_SCAN"), TRUE);
+               wfd_ug_view_refresh_button(ugd->scan_toolbar, D_("IDS_WIFI_SK4_SCAN"), TRUE);
        }*/
 
        if (ugd->multiconn_scan_stop_btn) {
@@ -757,6 +754,7 @@ int wfd_ug_get_discovered_peers(struct ug_data *ugd)
        return 0;
 }
 
+#if 0
 /**
  *     This function let the ug get the connecting peer
  *     @return   If success, return 0, else return -1
@@ -790,7 +788,7 @@ int wfd_ug_get_connecting_peer(struct ug_data *ugd)
        __FUNC_EXIT__;
        return 0;
 }
-
+#endif
 
 /**
  *     This function let the ug get the connected peers
@@ -825,7 +823,6 @@ void _wfd_ug_auto_exit(void *user_data)
        struct ug_data *ugd = (struct ug_data *)user_data;
        WFD_RET_IF(ugd == NULL, "Incorrect parameter(NULL)\n");
 
-       usleep(1000);
        deinit_wfd_client(ugd);
        wfd_destroy_ug(ugd);
 
@@ -957,7 +954,7 @@ void discover_cb(int error_code, wifi_direct_discovery_state_e discovery_state,
                ugd->wfd_discovery_status == WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL_START) {
                WFD_IF_DEL_ITEM(ugd->multi_connect_toolbar_item);
                if (!ugd->conn_wfd_item) {
-                       elm_object_part_content_set(ugd->layout, "button.big", ugd->scan_toolbar);
+                       elm_layout_content_set(ugd->button_layout, "button.big", ugd->scan_toolbar);
                }
                wfd_ug_view_refresh_button(ugd->scan_toolbar, "IDS_WIFI_SK_STOP", TRUE);
                if (ugd->multiconn_scan_stop_btn) {
@@ -1099,8 +1096,11 @@ void _connection_cb(int error_code, wifi_direct_connection_state_e connection_st
                        WFD_IF_DEL_OBJ(ugd->act_popup);
 
                        Evas_Object *content;
-                       content = elm_object_part_content_unset(ugd->layout, "button.next");
+                       content = elm_object_part_content_unset(ugd->button_layout, "button.next");
                        WFD_IF_DEL_OBJ(content);
+                       content = elm_object_part_content_unset(ugd->button_layout, "button.prev");
+                       evas_object_hide(content);
+
                        /* when disconnection, clear all the connected peers */
                        if (ugd->raw_connected_peer_cnt > 0) {
                                memset(ugd->raw_connected_peers, 0x00, ugd->raw_connected_peer_cnt*sizeof(device_type_s));
@@ -1694,20 +1694,20 @@ int wfd_client_switch_on(void *data)
 #ifndef MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE
                if (wifi_state > VCONFKEY_WIFI_OFF) {
                        DBG(LOG_INFO, "WiFi is connected, so have to turn off WiFi");
-                       wfd_ug_act_popup(ugd, _("IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"), POPUP_TYPE_WIFI_OFF);
+                       wfd_ug_act_popup(ugd, D_("IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q"), POPUP_TYPE_WIFI_OFF);
                } else
 #endif /* MODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE */
 
                if (is_wifi_enabled || is_wifi_ap_enabled) {
                        DBG(LOG_INFO, "WiFi is connected, so have to turn off WiFi");
-                       wfd_ug_act_popup(ugd, _("IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"), POPUP_TYPE_HOTSPOT_OFF);
+                       wfd_ug_act_popup(ugd, D_("IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q"), POPUP_TYPE_HOTSPOT_OFF);
                } else
 
                {
                        res = wifi_direct_activate();
                        if (res != WIFI_DIRECT_ERROR_NONE) {
                                DBG(LOG_ERROR, "Failed to activate Wi-Fi Direct. error code = [%d]\n", res);
-                               wfd_ug_warn_popup(ugd, _("IDS_COM_POP_FAILED"), POPUP_TYPE_TERMINATE);
+                               wfd_ug_warn_popup(ugd, D_("IDS_COM_POP_FAILED"), POPUP_TYPE_TERMINATE);
 #ifdef WFD_ON_OFF_GENLIST
                                wfd_ug_refresh_on_off_check(ugd);
 #endif
@@ -1793,7 +1793,7 @@ int wfd_client_switch_off(void *data)
                res = wifi_direct_deactivate();
                if (res != WIFI_DIRECT_ERROR_NONE) {
                        DBG(LOG_ERROR, "Failed to deactivate Wi-Fi Direct. error code = [%d]\n", res);
-                       wfd_ug_warn_popup(ugd, _("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_TERMINATE_DEACTIVATE_FAIL);
+                       wfd_ug_warn_popup(ugd, D_("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_TERMINATE_DEACTIVATE_FAIL);
 #ifdef WFD_ON_OFF_GENLIST
                        wfd_ug_refresh_on_off_check(ugd);
 #endif
@@ -1841,7 +1841,7 @@ int wfd_client_swtch_force(void *data, int onoff)
                res = wifi_direct_activate();
                if (res != WIFI_DIRECT_ERROR_NONE) {
                        DBG(LOG_ERROR, "Failed to activate Wi-Fi Direct. error code = [%d]\n", res);
-                       wfd_ug_warn_popup(ugd, _("IDS_COM_POP_FAILED"), POPUP_TYPE_TERMINATE);
+                       wfd_ug_warn_popup(ugd, D_("IDS_COM_POP_FAILED"), POPUP_TYPE_TERMINATE);
                        wfd_ug_refresh_on_off_check(ugd);
                        return -1;
                }
@@ -1849,7 +1849,7 @@ int wfd_client_swtch_force(void *data, int onoff)
                res = wifi_direct_deactivate();
                if (res != WIFI_DIRECT_ERROR_NONE) {
                        DBG(LOG_ERROR, "Failed to deactivate Wi-Fi Direct. error code = [%d]\n", res);
-                       wfd_ug_warn_popup(ugd, _("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_TERMINATE);
+                       wfd_ug_warn_popup(ugd, D_("IDS_WIFI_POP_DEACTIVATION_FAILED"), POPUP_TYPE_TERMINATE);
                        wfd_ug_refresh_on_off_check(ugd);
                        return -1;
                }