From: Niraj Kumar Goit Date: Wed, 1 Jun 2016 16:26:47 +0000 (+0530) Subject: [net-config] Use wrapper function to get vconfkeys value. X-Git-Tag: submit/tizen/20160608.101452~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a834ea394ec189a11352a20bbeec419bbec75187;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git [net-config] Use wrapper function to get vconfkeys value. Change-Id: I10b01fd00b1392c92ffb1e26fffd3550595b078c Signed-off-by: Niraj Kumar Goit --- diff --git a/include/util.h b/include/util.h old mode 100644 new mode 100755 index e43ec96..b3a1296 --- a/include/util.h +++ b/include/util.h @@ -86,6 +86,8 @@ int wc_launch_popup(netconfig_wcpopup_type_e type); #endif void netconfig_set_vconf_int(const char * key, int value); void netconfig_set_vconf_str(const char * key, const char * value); +int netconfig_vconf_get_int(const char * key, int *value); +int netconfig_vconf_get_bool(const char * key, int *value); char* netconfig_get_env(const char *key); void netconfig_set_mac_address_from_file(void); diff --git a/src/network-clock.c b/src/network-clock.c index 0feddfa..0ac5d25 100755 --- a/src/network-clock.c +++ b/src/network-clock.c @@ -95,7 +95,7 @@ static void __netconfig_clock( if (state != NETCONFIG_WIFI_CONNECTED) return; - vconf_get_bool( + netconfig_vconf_get_bool( VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, &automatic_time_update); @@ -120,7 +120,7 @@ static void __automatic_time_update_changed_cb(keynode_t *node, void *user_data) if (node != NULL) automatic_time_update = vconf_keynode_get_bool(node); else - vconf_get_bool(VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, &automatic_time_update); + netconfig_vconf_get_bool(VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, &automatic_time_update); if (automatic_time_update == FALSE) { INFO("Automatic time update is changed to 'FALSE'"); diff --git a/src/network-state.c b/src/network-state.c index 3a21979..8b80604 100755 --- a/src/network-state.c +++ b/src/network-state.c @@ -431,7 +431,7 @@ static void __netconfig_update_default_connection_info(void) else DBG("%s: ip(%s) proxy(%s)", profile, ip_addr, proxy_addr); - vconf_get_int(VCONFKEY_NETWORK_STATUS, &old_network_status); + netconfig_vconf_get_int(VCONFKEY_NETWORK_STATUS, &old_network_status); if (profile == NULL && old_network_status != VCONFKEY_NETWORK_OFF) { netconfig_set_vconf_int(VCONFKEY_NETWORK_STATUS, VCONFKEY_NETWORK_OFF); diff --git a/src/network-statistics.c b/src/network-statistics.c index 5d9e2d3..44f181e 100755 --- a/src/network-statistics.c +++ b/src/network-statistics.c @@ -109,7 +109,7 @@ static gboolean handle_get_wifi_total_tx_bytes( guint64 total_bytes = 0; int val = 0; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_SNT, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_SNT, &val); tx_bytes = (guint64)val; if (netconfig_wifi_get_bytes_statistics(&tx, &rx) == TRUE) @@ -130,7 +130,7 @@ static gboolean handle_get_wifi_total_rx_bytes( guint64 total_bytes = 0; int val = 0; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_RCV, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_RCV, &val); rx_bytes = (guint64)val; if (netconfig_wifi_get_bytes_statistics(&tx, &rx) == TRUE) @@ -151,7 +151,7 @@ static gboolean handle_get_wifi_last_tx_bytes( guint64 last_bytes = 0; int val = 0; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_SNT, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_SNT, &val); tx_bytes = (guint64)val; if (wifi_state_get_service_state() != NETCONFIG_WIFI_CONNECTED) { @@ -178,7 +178,7 @@ static gboolean handle_get_wifi_last_rx_bytes( guint64 last_bytes = 0; int val = 0; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_RCV, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_RCV, &val); rx_bytes = (guint64)val; if (wifi_state_get_service_state() != NETCONFIG_WIFI_CONNECTED) { @@ -317,10 +317,10 @@ void netconfig_wifi_statistics_update_powered_off(void) if (netconfig_wifi_get_bytes_statistics(&cur_tx, &cur_rx) != TRUE) return; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_SNT, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_SNT, &val); prev_tx = (guint64)val; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_RCV, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_TOTAL_RCV, &val); prev_rx = (guint64)val; total_tx = prev_tx + cur_tx; @@ -355,10 +355,10 @@ static void wifi_statistics_update_state(wifi_service_state_e state, void *user_ if (prev_state != NETCONFIG_WIFI_CONNECTED) return; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_SNT, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_SNT, &val); last_tx = (guint64)val; - vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_RCV, &val); + netconfig_vconf_get_int(VCONFKEY_NETWORK_WIFI_PKT_LAST_RCV, &val); last_rx = (guint64)val; last_tx = tx < last_tx ? 0 : tx - last_tx; diff --git a/src/signal-handler.c b/src/signal-handler.c index 02bdde8..19eb5b5 100755 --- a/src/signal-handler.c +++ b/src/signal-handler.c @@ -161,7 +161,7 @@ static void _service_signal_cb(GDBusConnection *conn, if (netconfig_is_wifi_profile(path) == TRUE) { int wifi_state = 0; - vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); + netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); if (wifi_state == VCONFKEY_WIFI_OFF) { g_free(property); goto done; diff --git a/src/utils/util.c b/src/utils/util.c index 03d5eba..39f547e 100755 --- a/src/utils/util.c +++ b/src/utils/util.c @@ -212,7 +212,7 @@ static void __netconfig_pop_device_picker(void) bundle *b = NULL; int wifi_ug_state = 0; - vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state); + netconfig_vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state); if (wifi_ug_state == VCONFKEY_WIFI_UG_RUN_STATE_ON_FOREGROUND) return; @@ -279,7 +279,7 @@ void netconfig_wifi_device_picker_service_start(void) #else int wifi_ug_state; - vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state); + netconfig_vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &wifi_ug_state); if (wifi_ug_state == VCONFKEY_WIFI_UG_RUN_STATE_ON_FOREGROUND) return; #endif @@ -310,7 +310,7 @@ gboolean netconfig_is_wifi_direct_on(void) #if defined TIZEN_P2P_ENABLE int wifi_direct_state = 0; - vconf_get_int(VCONFKEY_WIFI_DIRECT_STATE, &wifi_direct_state); + netconfig_vconf_get_int(VCONFKEY_WIFI_DIRECT_STATE, &wifi_direct_state); DBG("Wi-Fi direct mode %d", wifi_direct_state); return (wifi_direct_state != 0) ? TRUE : FALSE; @@ -324,8 +324,7 @@ gboolean netconfig_is_wifi_tethering_on(void) #if defined TIZEN_TETHERING_ENABLE int wifi_tethering_state = 0; - vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_MODE, &wifi_tethering_state); - + netconfig_vconf_get_int(VCONFKEY_MOBILE_HOTSPOT_MODE, &wifi_tethering_state); DBG("Wi-Ti tethering mode %d", wifi_tethering_state); if (wifi_tethering_state & VCONFKEY_MOBILE_HOTSPOT_MODE_WIFI) return TRUE; @@ -1023,6 +1022,32 @@ void netconfig_set_vconf_str(const char * key, const char * value) ERR("Failed to set"); } +int netconfig_vconf_get_int(const char * key, int *value) +{ + int ret = 0; + + ret = vconf_get_int(key, value); + if (ret != VCONF_OK) { + ERR("Failed to get vconfkey [%s] value", key); + return -1; + } + + return 0; +} + +int netconfig_vconf_get_bool(const char * key, int *value) +{ + int ret = 0; + + ret = vconf_get_bool(key, value); + if (ret != VCONF_OK) { + ERR("Failed to get vconfkey [%s] value", key); + return -1; + } + + return 0; +} + char* netconfig_get_env(const char *key) { FILE *fp; diff --git a/src/wifi-background-scan.c b/src/wifi-background-scan.c index b0e810f..2de65bb 100755 --- a/src/wifi-background-scan.c +++ b/src/wifi-background-scan.c @@ -198,7 +198,7 @@ static gboolean __netconfig_wifi_bgscan_next_scan(gpointer data) return FALSE; /* In case of LCD off, we don't need Wi-Fi scan */ - vconf_get_int(VCONFKEY_PM_STATE, &pm_state); + netconfig_vconf_get_int(VCONFKEY_PM_STATE, &pm_state); if (pm_state >= VCONFKEY_PM_STATE_LCDOFF) return TRUE; @@ -287,7 +287,7 @@ gboolean handle_set_bgscan(Wifi *wifi, GDBusMethodInvocation *context, guint sca netconfig_wifi_bgscan_stop(); /* In case of LCD off, we don't need Wi-Fi scan right now */ - vconf_get_int(VCONFKEY_PM_STATE, &pm_state); + netconfig_vconf_get_int(VCONFKEY_PM_STATE, &pm_state); if (pm_state >= VCONFKEY_PM_STATE_LCDOFF) netconfig_wifi_bgscan_start(FALSE); else diff --git a/src/wifi-firmware.c b/src/wifi-firmware.c index 276ed1a..ec5c72e 100755 --- a/src/wifi-firmware.c +++ b/src/wifi-firmware.c @@ -243,7 +243,7 @@ int netconfig_wifi_firmware(enum netconfig_wifi_firmware type, gboolean enable) #if defined WLAN_CONCURRENT_MODE #if defined TIZEN_TELEPHONY_ENABLE - vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode); + netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &flight_mode); #endif if (flight_mode == 0 && type == NETCONFIG_WIFI_STA && netconfig_is_wifi_direct_on() == TRUE) { diff --git a/src/wifi-indicator.c b/src/wifi-indicator.c index 35753cc..12372c2 100755 --- a/src/wifi-indicator.c +++ b/src/wifi-indicator.c @@ -324,7 +324,7 @@ static gboolean __wifi_indicator_monitor(gpointer data) return FALSE; /* In case of LCD off, we don't need to update Wi-Fi indicator */ - vconf_get_int(VCONFKEY_PM_STATE, &pm_state); + netconfig_vconf_get_int(VCONFKEY_PM_STATE, &pm_state); if (pm_state >= VCONFKEY_PM_STATE_LCDOFF) return TRUE; diff --git a/src/wifi-power.c b/src/wifi-power.c index 926ce46..ac61b02 100755 --- a/src/wifi-power.c +++ b/src/wifi-power.c @@ -87,7 +87,7 @@ static gboolean __is_wifi_restricted(void) #endif int restricted_mode = 0; - vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE, &restricted_mode); + netconfig_vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE, &restricted_mode); if (restricted_mode != 0) { DBG("network restricted mode[%d]", restricted_mode); return TRUE; @@ -440,13 +440,13 @@ int netconfig_wifi_on_wearable(gboolean device_picker_test) return -EPERM; } - if (vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use) < 0) { + if (netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use) < 0) { ERR("Fail to get VCONF_WIFI_WEARABLE_WIFI_USE"); return -EIO; } if (wifi_use > 0) { - if (vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &ps_mode) < 0) { + if (netconfig_vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &ps_mode) < 0) { ERR("Fail to get VCONFKEY_SETAPPL_PSMODE"); return -EIO; } @@ -514,7 +514,7 @@ static void __wearable_wifi_use_changed_cb(keynode_t* node, void* user_data) int wifi_use = 1; gboolean wifi_restrict = FALSE; - if (vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) { + if (netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) { ERR("Fail to get VCONFKEY_WIFI_STATE"); return; } @@ -522,7 +522,7 @@ static void __wearable_wifi_use_changed_cb(keynode_t* node, void* user_data) if (node != NULL) wifi_use = vconf_keynode_get_int(node); else - vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use); + netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use); if (wifi_use > 0) { DBG("wifi use on"); @@ -557,15 +557,15 @@ static void __netconfig_wifi_wearable_airplane_mode(keynode_t *node, int wifi_use = 0, airplane_state = 0; int wifi_use_off_by_airplane = 0; - vconf_get_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, + netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, &wifi_use_off_by_airplane); - vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use); + netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use); if (node != NULL) airplane_state = vconf_keynode_get_bool(node); else - vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_state); + netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_state); DBG("airplane mode %s (prev:%d)", airplane_state > 0 ? "ON" : "OFF", airplane_mode); DBG("Wi-Fi use %d, Wi-Fi was off by flight mode %s", wifi_use, @@ -601,14 +601,14 @@ static void __netconfig_wifi_airplane_mode(keynode_t *node, void *user_data) int wifi_state = 0, airplane_state = 0; int wifi_off_by_airplane = 0; - vconf_get_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, &wifi_off_by_airplane); + netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_AIRPLANE, &wifi_off_by_airplane); - vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); + netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); if (node != NULL) airplane_state = vconf_keynode_get_bool(node); else - vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_state); + netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_state); DBG("airplane mode %s (prev:%d)", airplane_state > 0 ? "ON" : "OFF", airplane_mode); DBG("Wi-Fi state %d, Wi-Fi was off by flight mode %s", wifi_state, @@ -647,14 +647,14 @@ static void __netconfig_wifi_restrict_mode(keynode_t *node, void *user_data) int wifi_state = 0, restricted = 0; int wifi_off_by_restricted = 0; - vconf_get_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, &wifi_off_by_restricted); + netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_RESTRICTED, &wifi_off_by_restricted); - vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); + netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); if (node != NULL) restricted = vconf_keynode_get_bool(node); else - vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE, &restricted); + netconfig_vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_RESTRICT_MODE, &restricted); DBG("network restricted mode %s", restricted > 0 ? "ON" : "OFF"); DBG("Wi-Fi state %d, Wi-Fi was off by restricted mode %s", wifi_state, @@ -694,11 +694,11 @@ static void __emergency_mode_changed_cb(keynode_t *node, void *user_data) int wifi_use = 1; #endif - vconf_get_int(VCONF_WIFI_OFF_STATE_BY_EMERGENCY, &wifi_off_by_emergency); - vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); + netconfig_vconf_get_int(VCONF_WIFI_OFF_STATE_BY_EMERGENCY, &wifi_off_by_emergency); + netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state); #if !defined TIZEN_WEARABLE - vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_PERMIT_WITH_LCD_OFF_LIMIT, &emergency_by_fmm); + netconfig_vconf_get_bool(VCONFKEY_SETAPPL_NETWORK_PERMIT_WITH_LCD_OFF_LIMIT, &emergency_by_fmm); DBG("emergency mode by Find My Mobile (%d)", emergency_by_fmm); if (emergency_by_fmm == 1) return; @@ -707,7 +707,7 @@ static void __emergency_mode_changed_cb(keynode_t *node, void *user_data) if (node != NULL) emergency = vconf_keynode_get_int(node); else - vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &emergency); + netconfig_vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &emergency); DBG("emergency mode %s", emergency > SETTING_PSMODE_POWERFUL ? "ON" : "OFF"); DBG("Wi-Fi state %d, Wi-Fi was off by emergency mode %s", wifi_state, wifi_off_by_emergency ? "Yes" : "No"); @@ -717,7 +717,7 @@ static void __emergency_mode_changed_cb(keynode_t *node, void *user_data) /* basic power saving mode on */ } else if (emergency == SETTING_PSMODE_WEARABLE_ENHANCED) { /* enhanced power saving mode on */ - vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use); + netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use); psmode_wifi_use = wifi_use; if (wifi_use != 0) netconfig_set_vconf_int(VCONF_WIFI_WEARABLE_WIFI_USE, 0); @@ -770,7 +770,7 @@ static void __pm_state_changed_cb(keynode_t* node, void* user_data) int wifi_state = 0; static int prev_state = VCONFKEY_PM_STATE_NORMAL; - if (vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) { + if (netconfig_vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state) < 0) { ERR("Fail to get VCONFKEY_WIFI_STATE"); return; } @@ -784,7 +784,7 @@ static void __pm_state_changed_cb(keynode_t* node, void* user_data) if (node != NULL) new_state = vconf_keynode_get_int(node); else - vconf_get_int(VCONFKEY_PM_STATE, &new_state); + netconfig_vconf_get_int(VCONFKEY_PM_STATE, &new_state); DBG("wifi state: %d (0 off / 1 on / 2 connected)", wifi_state); DBG("Old PM state: %d, current: %d", prev_state, new_state); @@ -868,7 +868,7 @@ static void __netconfig_telephony_ready_changed_cb(keynode_t * node, void *data) if (node != NULL) telephony_ready = vconf_keynode_get_bool(node); else - vconf_get_bool(VCONFKEY_TELEPHONY_READY, &telephony_ready); + netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_READY, &telephony_ready); if (telephony_ready != 0) { if (netconfig_tapi_check_sim_state() == FALSE) { @@ -997,7 +997,7 @@ int wifi_power_on_wearable(gboolean device_picker_test) return -EPERM; } - if (vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use) < 0) { + if (netconfig_vconf_get_int(VCONF_WIFI_WEARABLE_WIFI_USE, &wifi_use) < 0) { ERR("Fail to get VCONF_WIFI_WEARABLE_WIFI_USE"); return -EIO; } @@ -1026,16 +1026,16 @@ void wifi_power_initialize(void) /* Initialize Airplane mode */ #if defined TIZEN_TELEPHONY_ENABLE - vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_mode); + netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &airplane_mode); #endif DBG("Airplane[%s]", airplane_mode > 0 ? "ON" : "OFF"); /* Update the last Wi-Fi power state */ - vconf_get_int(VCONF_WIFI_LAST_POWER_STATE, &wifi_last_power_state); + netconfig_vconf_get_int(VCONF_WIFI_LAST_POWER_STATE, &wifi_last_power_state); if (wifi_last_power_state > VCONFKEY_WIFI_OFF) { #if defined TIZEN_TELEPHONY_ENABLE int telephony_ready = 0; - vconf_get_bool(VCONFKEY_TELEPHONY_READY, &telephony_ready); + netconfig_vconf_get_bool(VCONFKEY_TELEPHONY_READY, &telephony_ready); if (telephony_ready == 0) { DBG("Telephony API is not initialized yet"); vconf_notify_key_changed(VCONFKEY_TELEPHONY_READY, diff --git a/src/wifi-state.c b/src/wifi-state.c index 3b34ca4..3819afc 100755 --- a/src/wifi-state.c +++ b/src/wifi-state.c @@ -230,13 +230,13 @@ static gboolean _check_network_notification(gpointer data) goto cleanup; } - vconf_get_int(VCONFKEY_WIFI_ENABLE_QS, &qs_enable); + netconfig_vconf_get_int(VCONFKEY_WIFI_ENABLE_QS, &qs_enable); if (qs_enable != VCONFKEY_WIFI_QS_ENABLE) { DBG("qs_enable != VCONFKEY_WIFI_QS_ENABLE"); goto cleanup; } - vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &ug_state); + netconfig_vconf_get_int(VCONFKEY_WIFI_UG_RUN_STATE, &ug_state); if (ug_state == VCONFKEY_WIFI_UG_RUN_STATE_ON_FOREGROUND) goto cleanup; @@ -287,7 +287,7 @@ static void __notification_value_changed_cb(keynode_t *node, void *user_data) { int value = -1; - if (vconf_get_int(VCONFKEY_WIFI_ENABLE_QS, &value) < 0) + if (netconfig_vconf_get_int(VCONFKEY_WIFI_ENABLE_QS, &value) < 0) return; if (value == VCONFKEY_WIFI_QS_DISABLE) diff --git a/src/wifi-wps.c b/src/wifi-wps.c index ac222a0..618a2c6 100755 --- a/src/wifi-wps.c +++ b/src/wifi-wps.c @@ -512,7 +512,7 @@ gboolean handle_request_wps_scan(Wifi *wifi, GDBusMethodInvocation *context) tech_state = wifi_state_get_technology_state(); if (tech_state <= NETCONFIG_WIFI_TECH_OFF) { #if !defined TIZEN_WEARABLE - vconf_get_int(VCONF_WIFI_ALWAYS_ALLOW_SCANNING, &enabled); + netconfig_vconf_get_int(VCONF_WIFI_ALWAYS_ALLOW_SCANNING, &enabled); #else enabled = 0; #endif