From 22469e69bef2d4279246744b1f02e0e90b581897 Mon Sep 17 00:00:00 2001 From: Joohyun Kim Date: Mon, 12 Aug 2013 15:28:18 +0900 Subject: [PATCH] Fix locale issue and enable common-service Change-Id: I77358db84bfc74e83dcaf4c8fdef1ca69278f33d Signed-off-by: Joohyun Kim --- .../setting/providers/FSys_SettingLocaleProvider.cpp | 8 +++++--- src/system/FSys_SettingInfoImpl.cpp | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp b/src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp index 317b4ac..a370116 100644 --- a/src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp +++ b/src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp @@ -578,12 +578,10 @@ _SettingLocaleProvider::SettingEventRuntimeInfo(runtime_info_key_e key, void* us settingKey = _LOCALE_TIME_FORMAT; pSettingInfo->AnnounceSettingEvent(settingKey); settingKey = _LOCALE_COUNTRY; - pSettingInfo->AnnounceSettingEvent(settingKey); } else if(key == RUNTIME_INFO_KEY_LANGUAGE) { - settingKey.Append(_LOCALE_LANGUAGE); - pSettingInfo->AnnounceSettingEvent(settingKey); + settingKey = _LOCALE_LANGUAGE; } else if(key == RUNTIME_INFO_KEY_24HOUR_CLOCK_FORMAT_ENABLED) { @@ -593,6 +591,10 @@ _SettingLocaleProvider::SettingEventRuntimeInfo(runtime_info_key_e key, void* us pSettingInfo->AnnounceSettingEvent(settingKey); settingKey = _LOCALE_TIME_FORMAT_24HOUR; } + else + { + return; + } r = pSettingInfo->AnnounceSettingEvent(settingKey); SysTryReturnVoidResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to send the event[%ls].", settingKey.GetPointer()); } diff --git a/src/system/FSys_SettingInfoImpl.cpp b/src/system/FSys_SettingInfoImpl.cpp index 26cec35..d131e3f 100644 --- a/src/system/FSys_SettingInfoImpl.cpp +++ b/src/system/FSys_SettingInfoImpl.cpp @@ -88,6 +88,7 @@ _SettingInfoImpl::InitSettingClient(void) { if(pSettingClient == null && pSettingClientEx == null) { +/* if(File::IsFileExist(_COMMON_SERVICE_ENABLED) == false) { if(pSettingClient == null) @@ -96,6 +97,7 @@ _SettingInfoImpl::InitSettingClient(void) } } else +*/ { common_mode = true; if(pSettingClientEx == null) -- 2.7.4