From 1eb89cedfeafffbea333db2ba4aff77d264be281 Mon Sep 17 00:00:00 2001 From: hyun lee Date: Fri, 28 Jun 2013 15:55:48 +0900 Subject: [PATCH] Fix for issue N_SE-41952 Change-Id: Ib15c6fa9f2703c14045f3dad6cee06bb0f805b17 Signed-off-by: hyun lee --- src/controls/FWebCtrl_EflWebkit.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/controls/FWebCtrl_EflWebkit.h | 4 +++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/controls/FWebCtrl_EflWebkit.cpp b/src/controls/FWebCtrl_EflWebkit.cpp index 7a8dabe..aa56acf 100755 --- a/src/controls/FWebCtrl_EflWebkit.cpp +++ b/src/controls/FWebCtrl_EflWebkit.cpp @@ -22,6 +22,7 @@ * The file contains the definition of _EflWebkit class. */ #include +#include #include #include #include @@ -174,6 +175,8 @@ _EflWebkit::SetWebConfiguration(void) const r = SetProxyAddress(); SysTryReturn(NID_WEB_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + InitializeCustomHeader(); + return E_SUCCESS; } @@ -312,6 +315,39 @@ _EflWebkit::SetProxyAddress(void) const } +void +_EflWebkit::InitializeCustomHeader(void) const +{ + std::unique_ptr pLang(vconf_get_str(VCONFKEY_LANGSET)); + std::unique_ptr pRegion(vconf_get_str(VCONFKEY_LANGSET)); + const char name[] = "Accept-Language"; + String value(L""); + + if (pLang.get()) + { + if (pRegion.get()) + { + value.Append(pLang.get()); + value.Append(L"_"); + value.Append(pRegion.get()); + } + else + { + value.Append(pLang.get()); + } + } + else + { + value = L"en"; + } + + std::unique_ptr pValue(_StringConverter::CopyToCharArrayN(value)); + SysTryReturnVoidResult(NID_WEB_CTRL, pValue.get(), E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY)); + + ewk_view_custom_header_add(__pWebFrame, name, pValue.get()); +} + + Evas_Object* _EflWebkit::GetWebEvasObject(void) const { diff --git a/src/controls/FWebCtrl_EflWebkit.h b/src/controls/FWebCtrl_EflWebkit.h index 69cec83..e4cee87 100755 --- a/src/controls/FWebCtrl_EflWebkit.h +++ b/src/controls/FWebCtrl_EflWebkit.h @@ -77,7 +77,9 @@ private: result CreateResourceDirectory(void) const; - result InitializeCustomDb() const; + result InitializeCustomDb(void) const; + + void InitializeCustomHeader(void) const; _EflWebkit& operator =(const _EflWebkit&); -- 2.7.4