From 30aa4ca3f7bffadd195cbd39625fe8a7448dbd11 Mon Sep 17 00:00:00 2001
From: Tae-Jeong Lee <taejeong.lee@samsung.com>
Date: Mon, 9 Sep 2013 11:58:37 +0900
Subject: [PATCH] [Release] wrt_0.8.271

Change-Id: I1008134af02cf5de976ad95dc58c2655af379baf
---
 packaging/wrt.spec             |  2 +-
 src/domain/widget_model.cpp    |  3 ---
 src/domain/widget_model.h      |  7 -------
 src/view/webkit/CMakeLists.txt |  1 -
 src/view/webkit/view_logic.cpp | 15 ++++++++++++---
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packaging/wrt.spec b/packaging/wrt.spec
index db89ff6..9288b27 100644
--- a/packaging/wrt.spec
+++ b/packaging/wrt.spec
@@ -1,7 +1,7 @@
 #git:framework/web/wrt
 Name:       wrt
 Summary:    web runtime
-Version:    0.8.270
+Version:    0.8.271
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
diff --git a/src/domain/widget_model.cpp b/src/domain/widget_model.cpp
index 5e0ebf6..1f34ea3 100644
--- a/src/domain/widget_model.cpp
+++ b/src/domain/widget_model.cpp
@@ -91,9 +91,6 @@ WidgetModel::WidgetModel(const std::string &tizenId) :
     LicenseHref(this),
     //localized, so not binded
     Icon(this),
-    Version(this,
-            &BindToWidgetDAO<DPL::OptionalString,
-            &WidgetDAOReadOnly::getVersion>::Get),
     SplashImg(
         this,
         &BindToWidgetDAO<DPL::OptionalString,
diff --git a/src/domain/widget_model.h b/src/domain/widget_model.h
index 4417848..b6f74f3 100644
--- a/src/domain/widget_model.h
+++ b/src/domain/widget_model.h
@@ -179,13 +179,6 @@ class WidgetModel : public DPL::Event::Model
     DPL::Event::Property<OptionalWidgetIcon> Icon;
 
     /**
-     * @brief Widget version
-     */
-    DPL::Event::Property<DPL::OptionalString,
-                         DPL::Event::PropertyReadOnly,
-                         DPL::Event::PropertyStorageDynamicCached> Version;
-
-    /**
      * @brief Widget splash image src
      */
     DPL::Event::Property<DPL::OptionalString,
diff --git a/src/view/webkit/CMakeLists.txt b/src/view/webkit/CMakeLists.txt
index 8feecf1..aaf05a8 100644
--- a/src/view/webkit/CMakeLists.txt
+++ b/src/view/webkit/CMakeLists.txt
@@ -56,7 +56,6 @@ SET(VIEW_MODULE_SOURCES
     ${PROJECT_SOURCE_DIR}/src/view/webkit/view_logic_message_support.cpp
     ${PROJECT_SOURCE_DIR}/src/view/webkit/view_logic_orientation_support.cpp
     ${PROJECT_SOURCE_DIR}/src/view/webkit/view_logic_scheme_support.cpp
-    ${PROJECT_SOURCE_DIR}/src/view/webkit/view_logic_user_agent_support.cpp
     ${PROJECT_SOURCE_DIR}/src/view/webkit/view_logic_usermedia_support.cpp
     ${PROJECT_SOURCE_DIR}/src/view/webkit/view_logic_web_notification_data.cpp
     ${PROJECT_SOURCE_DIR}/src/view/webkit/view_logic_web_notification_support.cpp
diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp
index abb702f..3a3d750 100644
--- a/src/view/webkit/view_logic.cpp
+++ b/src/view/webkit/view_logic.cpp
@@ -59,7 +59,6 @@
 #include <view_logic_message_support.h>
 #include <view_logic_orientation_support.h>
 #include <view_logic_scheme_support.h>
-#include <view_logic_user_agent_support.h>
 #include <view_logic_usermedia_support.h>
 #include <view_logic_web_notification_data.h>
 #include <view_logic_web_notification_support.h>
@@ -745,10 +744,20 @@ void ViewLogic::prepareEwkView(Evas_Object *wkView)
 {
     LogDebug("prepareEwkView called");
     Assert(wkView);
-    ViewModule::UserAgentSupport::setUserAgent(m_model, wkView);
-
     Ewk_Settings* settings = ewk_view_settings_get(wkView);
 
+    // set user agent
+    std::string customUserAgent = m_model->SettingList.Get().getUserAgent();
+    if (customUserAgent.empty()) {
+        LogDebug("Setting user agent as: default");
+        ewk_view_user_agent_set(wkView, NULL);
+        std::string defaultUA = ewk_view_user_agent_get(wkView);
+        LogDebug("webkit's UA: " << defaultUA);
+    } else {
+        LogDebug("Setting  custom user agent as: " << customUserAgent);
+        ewk_view_user_agent_set(wkView, customUserAgent.c_str());
+    }
+
     // set custom header : language
     using namespace ViewModule::CustomHeaderSupport;
     std::string customHeaderString = getValueByField(ACCEPT_LANGUAGE);
-- 
2.7.4