diff options
| author | Susnata Sovalin <s.sovalin@samsung.com> | 2018-09-10 10:16:23 +0530 |
|---|---|---|
| committer | Susnata Sovalin <s.sovalin@samsung.com> | 2018-09-11 11:07:19 +0530 |
| commit | bc8fd68f6b8885fb7bba9d2ec49aedeec238deb2 (patch) | |
| tree | 622a82a64f5dfb8adf43b252b20f2dea7f7ccc41 | |
| parent | 7ff771adfe7edc47e8effc8662d9221131339dbf (diff) | |
| download | lbs-server-tizen_5.0.tar.gz lbs-server-tizen_5.0.tar.bz2 lbs-server-tizen_5.0.zip | |
Replaced capi-network-wifi dependencysubmit/tizen_5.0/20181101.000003submit/tizen/20180911.092154accepted/tizen/unified/20180912.061634accepted/tizen/5.0/unified/20181102.015535tizen_5.0accepted/tizen_5.0_unified
Change-Id: I827096123d88ab6cd438f21fb77c5a1ec8b9df11
Signed-off-by: Susnata Sovalin <s.sovalin@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | lbs-server/src/setting.c | 15 | ||||
| -rw-r--r-- | packaging/lbs-server.spec | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d968ad3..4a2250e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ SET(BIN_DIR "${PREFIX}/bin") #Dependencies SET(common_dp "glib-2.0 lbs-dbus dlog gio-2.0 lbs-location") -SET(server_dp "${common_dp} network tapi vconf vconf-internal-keys gthread-2.0 gio-unix-2.0 capi-network-wifi capi-system-info libtzplatform-config") +SET(server_dp "${common_dp} network tapi vconf vconf-internal-keys gthread-2.0 gio-unix-2.0 capi-network-wifi-manager capi-system-info libtzplatform-config") SET(module_dp "${common_dp} gmodule-2.0") # Set required packages diff --git a/lbs-server/src/setting.c b/lbs-server/src/setting.c index 6e67bee..18de429 100644..100755 --- a/lbs-server/src/setting.c +++ b/lbs-server/src/setting.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <stdio.h> -#include <wifi.h> +#include <wifi-manager.h> #include <unistd.h> int setting_set_int(const char *path, int val) @@ -115,11 +115,16 @@ static unsigned char _get_mac_address(char *mac) { int rv = 0; char *mac_addr = NULL; - - rv = wifi_get_mac_address(&mac_addr); - if (rv != WIFI_ERROR_NONE) + wifi_manager_h wifi = NULL; + rv = wifi_manager_initialize(&wifi); + if (WIFI_MANAGER_ERROR_NONE == rv) { + rv = wifi_manager_get_mac_address(wifi, &mac_addr); + } else { + LOG_GPS(DBG_ERR, "Wifi-Manger init failed [%s]", rv); + return FALSE; + } + if (rv != WIFI_MANAGER_ERROR_NONE) return FALSE; - g_strlcpy(mac, mac_addr, NPS_UNIQUE_ID_LEN); g_free(mac_addr); diff --git a/packaging/lbs-server.spec b/packaging/lbs-server.spec index 19a9f2a..3892ac4 100644 --- a/packaging/lbs-server.spec +++ b/packaging/lbs-server.spec @@ -18,7 +18,7 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(lbs-location) BuildRequires: pkgconfig(lbs-dbus) BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(capi-network-wifi) +BuildRequires: pkgconfig(capi-network-wifi-manager) BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(vconf-internal-keys) |