Use vconf instead of system-settings

 - to remove system-settings dependancy, use vconf

Change-Id: I40f6def4ede68f32d8f1f50d6f17b90b09cc3d59

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9be56b2..c360255 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 FILE(GLOB SRCS src/*.c)
 
 pkg_check_modules(pkgs REQUIRED glib-2.0 dlog capi-base-common gio-2.0
-       capi-system-info capi-system-system-settings gio-unix-2.0 iotivity cynara-client uuid)
+       capi-system-info vconf gio-unix-2.0 iotivity cynara-client uuid)
 
 FOREACH(flag ${pkgs_CFLAGS_OTHER})
        IF(${flag} MATCHES "\\-D+")

diff --git a/packaging/iotcon.spec b/packaging/iotcon.spec
index d8eaf91..852d74c 100644 (file)
--- a/packaging/iotcon.spec
+++ b/packaging/iotcon.spec
@@ -17,7 +17,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(capi-system-info)
-BuildRequires:  pkgconfig(capi-system-system-settings)
+BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(capi-network-wifi)
 BuildRequires:  pkgconfig(iotivity)
 BuildRequires:  pkgconfig(uuid)

diff --git a/src/ic-ioty.c b/src/ic-ioty.c
index 6e570fd..6355378 100644 (file)
--- a/src/ic-ioty.c
+++ b/src/ic-ioty.c
@@ -22,7 +22,6 @@
 #include <octypes.h>
 #include <ocstack.h>
 #include <ocpayload.h>
-#include <system_settings.h>
 #include <pinoxmcommon.h>
 
 #include "iotcon.h"

diff --git a/src/ic-utils.c b/src/ic-utils.c
index ba7937f..8b0c172 100644 (file)
--- a/src/ic-utils.c
+++ b/src/ic-utils.c
@@ -22,7 +22,7 @@
 #include <pthread.h>
 #include <glib.h>
 #include <system_info.h>
-#include <system_settings.h>
+#include <vconf.h>
 #include <cynara-client.h>
 #include <cynara-error.h>
 
@@ -175,18 +175,20 @@ int ic_utils_get_platform_info(OCPlatformInfo *platform_info)
 
        RETV_IF(NULL == platform_info, IOTCON_ERROR_INVALID_PARAMETER);
 
-       ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_DEVICE_NAME, &device_name);
-       WARN_IF(SYSTEM_SETTINGS_ERROR_NONE != ret,
-                       "system_settings_get_value_string() Fail(%d)", ret);
+       device_name = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+       WARN_IF(device_name == NULL, "vconf_get_str() Fail");
+
        ret = system_info_get_platform_string(IC_SYSTEM_INFO_TIZEN_ID, &tizen_id);
-       WARN_IF(SYSTEM_INFO_ERROR_NONE != ret, "system_info_get_platform_string() Fail(%d)",
-                       ret);
-       snprintf(platform_id, sizeof(platform_id), "%s(%s)", IC_SAFE_STR(device_name),
-                       IC_SAFE_STR(tizen_id));
-       free(device_name);
-       free(tizen_id);
+       WARN_IF(SYSTEM_INFO_ERROR_NONE != ret, "system_info_get_platform_string() Fail(%d)", ret);
+
+       snprintf(platform_id, sizeof(platform_id), "%s(%s)", IC_SAFE_STR(device_name), IC_SAFE_STR(tizen_id));
        SECURE_DBG("platform_id: %s", platform_id);
 
+       if (device_name)
+               free(device_name);
+       if (tizen_id)
+               free(tizen_id);
+
        /* Mandatory (oic.wk.p) */
        platform_info->platformID = strdup(platform_id);