Remove CONNECTION_AGENT build flag and add it to config file

Change-Id: I2e739b86ab431ddc77fff3e642767ece4dd6d3e1
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc185c6..f12611c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,9 +33,6 @@ ENDIF(TIZEN_WLAN_BOARD_SPRD)
 IF(TIZEN_TETHERING_ENABLE)
        ADD_DEFINITIONS(-DTIZEN_TETHERING_ENABLE)
 ENDIF(TIZEN_TETHERING_ENABLE)
-IF(TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
-ENDIF(TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
 IF(TIZEN_FEATURE_IP_OVER_EAPOL)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_IP_OVER_EAPOL)
 ENDIF(TIZEN_FEATURE_IP_OVER_EAPOL)

diff --git a/include/wifi-direct-util.h b/include/wifi-direct-util.h
index c4645b7..cddd8d5 100644 (file)
--- a/include/wifi-direct-util.h
+++ b/include/wifi-direct-util.h
@@ -68,10 +68,8 @@ int wfd_util_get_wifi_direct_state();
 int wfd_util_set_wifi_direct_state(int state);
 int wfd_util_get_local_dev_mac(unsigned char *dev_mac);
 
-#ifdef TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT
 int wfd_util_start_wifi_direct_popup();
 int wfd_util_stop_wifi_direct_popup();
-#endif /* TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT */
 
 int wfd_util_dhcps_start(char *ifname);
 int wfd_util_dhcps_wait_ip_leased(wfd_device_s *peer);

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 62d08bd..39a01a9 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -8,7 +8,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.233
+Version:       1.2.234
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -214,7 +214,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
-       -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_MOBILE=1 \
@@ -242,7 +241,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %endif
        -DTIZEN_WLAN_BOARD_SPRD=1 \
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
-       -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_MOBILE=1 \

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index ba630c3..b8eca11 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -151,9 +151,9 @@ void wfd_event_deactivated(wfd_oem_event_s *event)
        wfd_util_set_wifi_direct_state(WIFI_DIRECT_STATE_DEACTIVATED);
        manager->req_wps_mode = WFD_WPS_MODE_PBC;
 
-#ifdef TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT
-       wfd_util_stop_wifi_direct_popup();
-#endif /* TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT */
+       if (manager->is_connection_agent)
+               wfd_util_stop_wifi_direct_popup();
+
        __WDS_LOG_FUNC_EXIT__;
        return;
 }

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index dde59e5..9f7e1d4 100644 (file)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -642,9 +642,8 @@ int wfd_manager_activate(wfd_manager_s *manager)
 
        wfd_manager_local_config_set(manager);
        wfd_util_set_country();
-#ifdef TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT
-       wfd_util_start_wifi_direct_popup();
-#endif /* TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT */
+       if (manager->is_connection_agent)
+               wfd_util_start_wifi_direct_popup();
 
        res = wfd_util_get_local_dev_mac(manager->local->dev_addr);
        if (res < 0)
@@ -727,9 +726,9 @@ int wfd_manager_deactivate(wfd_manager_s *manager)
        wfd_peer_clear_all(manager);
        wfd_local_reset_data(manager);
 
-#ifdef TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT
-       wfd_util_stop_wifi_direct_popup();
-#endif /* TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT */
+       if (manager->is_connection_agent)
+               wfd_util_stop_wifi_direct_popup();
+
        __WDS_LOG_FUNC_EXIT__;
        return WIFI_DIRECT_ERROR_NONE;
 }

diff --git a/src/wifi-direct-util.c b/src/wifi-direct-util.c
index f60d109..736a813 100644 (file)
--- a/src/wifi-direct-util.c
+++ b/src/wifi-direct-util.c
@@ -45,10 +45,8 @@
 #include <vconf.h>
 #include <tzplatform_config.h>
 #include <system_info.h>
-#if defined(TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
 #include <systemd/sd-login.h>
 #include <aul.h>
-#endif
 #include <wifi-direct.h>
 
 #include "wifi-direct-ipc.h"
@@ -289,7 +287,6 @@ int wfd_util_get_current_time(unsigned long *cur_time)
 }
 #endif
 
-#if defined(TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
 static int __wfd_util_find_login_user(uid_t *uid)
 {
        uid_t *uids;
@@ -317,7 +314,6 @@ static int __wfd_util_find_login_user(uid_t *uid)
        free(state);
        return -1;
 }
-#endif
 
 gboolean wfd_util_execute_file(const char *file_path,
        char *const args[], char *const envs[])
@@ -899,7 +895,6 @@ int wfd_util_get_local_dev_mac(unsigned char *dev_mac)
        return 0;
 }
 
-#ifdef TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT
 int wfd_util_start_wifi_direct_popup()
 {
        __WDS_LOG_FUNC_ENTER__;
@@ -950,7 +945,6 @@ int wfd_util_stop_wifi_direct_popup()
        __WDS_LOG_FUNC_EXIT__;
        return 0;
 }
-#endif /* TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT */
 
 int _connect_remote_device(char *ip_str)
 {