Change runtim-info keys to system-settings keys to apply vconf-internal-keys changes

Change-Id: I7c9c6db6d363bffcf6bcdd1b5ceaafb9a0a12f8b

diff --git a/packaging/wrt.spec b/packaging/wrt.spec
index ebbb1d3..4cf20db 100755 (executable)
--- a/packaging/wrt.spec
+++ b/packaging/wrt.spec
@@ -31,7 +31,7 @@ BuildRequires: pkgconfig(manifest-handlers)
 BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(efl-assist)
 BuildRequires: pkgconfig(deviced)
-BuildRequires: pkgconfig(capi-system-runtime-info)
+BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(cert-svc)
 BuildRequires: pkgconfig(uuid)
 BuildRequires: pkgconfig(gio-2.0)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index f107499..3599f4d 100755 (executable)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -19,7 +19,7 @@ PKG_CHECK_MODULES(TARGET_COMMON_STATIC_DEPS
   gio-2.0
   dlog
   capi-appfw-package-manager
-  capi-system-runtime-info
+  capi-system-system-settings
   capi-appfw-application
   aul
   appsvc

diff --git a/src/common/locale_manager.cc b/src/common/locale_manager.cc
index cbf3a98..d31956c 100755 (executable)
--- a/src/common/locale_manager.cc
+++ b/src/common/locale_manager.cc
@@ -16,7 +16,7 @@
 
 #include "common/locale_manager.h"
 
-#include <runtime_info.h>
+#include <system_settings.h>
 #include <memory>
 #include <algorithm>
 
@@ -46,18 +46,18 @@ LocaleManager::LocaleManager() {
 }
 
 LocaleManager::~LocaleManager() {
-  runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_LANGUAGE);
+  system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE);
 }
 
 void LocaleManager::EnableAutoUpdate(bool enable) {
   if (enable) {
-    auto callback = [](runtime_info_key_e, void* user_data) {
+    auto callback = [](system_settings_key_e, void* user_data) {
         LocaleManager* locale = static_cast<LocaleManager*>(user_data);
         locale->UpdateSystemLocale();
     };
-    runtime_info_set_changed_cb(RUNTIME_INFO_KEY_LANGUAGE, callback, this);
+    system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, callback, this);
   } else {
-    runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_LANGUAGE);
+    system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE);
   }
 }
 
@@ -74,8 +74,8 @@ void LocaleManager::SetDefaultLocale(const std::string& locale) {
 
 void LocaleManager::UpdateSystemLocale() {
   char* str = NULL;
-  if (RUNTIME_INFO_ERROR_NONE !=
-      runtime_info_get_value_string(RUNTIME_INFO_KEY_LANGUAGE, &str)
+  if (SYSTEM_SETTINGS_ERROR_NONE !=
+      system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &str)
      || str == NULL) {
     return;
   }