Replaced capi-network-wifi dependency

Change-Id: I827096123d88ab6cd438f21fb77c5a1ec8b9df11
Signed-off-by: Susnata Sovalin <s.sovalin@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d968ad37b5fd427fdc47bb7e68a366339360255d..4a2250e7999a7cb59c4265a034f414b5fe59ad60 100644 (file)
--- 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
old mode 100644 (file)
new mode 100755 (executable)
index 6e67bee..18de429
--- 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 19a9f2a281e8ff7c11470ff34bad9ce73b6edd3d..3892ac40044430fd8688876f150e1e22344a7822 100644 (file)
--- 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)