summaryrefslogtreecommitdiff
path: root/ug-wifidirect/src/wfd_client.c
diff options
context:
space:
mode:
Diffstat (limited to 'ug-wifidirect/src/wfd_client.c')
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/src/wfd_client.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c
index 8bd357b..f9219bc 100644..100755
--- a/ug-wifidirect/src/wfd_client.c
+++ b/ug-wifidirect/src/wfd_client.c
@@ -489,11 +489,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 */
@@ -957,7 +956,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) {
@@ -1069,10 +1068,6 @@ void _connection_cb(int error_code, wifi_direct_connection_state_e connection_st
_wfd_ug_auto_exit(ugd);
}
- if(ugd->ctxpopup != NULL && ugd->more_btn_multiconnect_item) {
- elm_object_item_disabled_set(ugd->more_btn_multiconnect_item, TRUE);
- }
-
wfd_ug_update_connected_peers(ugd);
} else {
peer->conn_status = PEER_CONN_STATUS_FAILED_TO_CONNECT;
@@ -1103,8 +1098,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));
@@ -1479,13 +1477,11 @@ void wfd_gdbus_callback(GObject *source_object, GAsyncResult *result, gpointer u
WFD_RET_IF(res != 0, "Failed to initialize WFD client library\n");
/* Activate WiFi Direct */
- /*
DBG(LOG_INFO, "Activating WiFi Direct...");
if (ugd->wfd_status <= WIFI_DIRECT_STATE_DEACTIVATING) {
res = wfd_client_switch_on(ugd);
WFD_RET_IF(res != 0, "Failed to activate WFD\n");
}
- */
__FUNC_EXIT__;
}