From 6717121951b6fa2003a7ba4bef01439a5a3ecb7a Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Wed, 14 Nov 2012 08:08:53 +0900 Subject: [PATCH] Remove build warning [Issue#] N/A [Problem] Build warning is occurred by deprecated API [Cause] Some webkit API is deprecated [Solution] Replace API to new API [SCMRequest] N/A Change-Id: Iaead7ed71fbe81a319dd66b23f8939ef98fb9031 --- src/view/webkit/view_logic.cpp | 10 +++++----- src/view/webkit/view_logic_geolocation_support_webkit2.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/view/webkit/view_logic.cpp b/src/view/webkit/view_logic.cpp index cffe1b3..a6b6bfb 100644 --- a/src/view/webkit/view_logic.cpp +++ b/src/view/webkit/view_logic.cpp @@ -813,7 +813,7 @@ void ViewLogic::prepareEwkView(Evas_Object *wkView) { LogDebug("prepareEwkView called"); Assert(wkView); - Ewk_Setting* setting = ewk_view_setting_get(wkView); + Ewk_Settings* settings = ewk_view_settings_get(wkView); // set user agent auto userAgentString = @@ -835,7 +835,7 @@ void ViewLogic::prepareEwkView(Evas_Object *wkView) } // webkit NPAPI plugins is always on in wrt - ewk_setting_enable_plugins_set(setting, EINA_TRUE); + ewk_settings_plugins_enabled_set(settings, EINA_TRUE); // The followings are not implemeted yet by webkit2 // ewk_view_setting_accelerated_compositing_enable_set(EINA_TRUE); @@ -844,9 +844,9 @@ void ViewLogic::prepareEwkView(Evas_Object *wkView) // ewk_view_setting_html5video_external_player_enable_set(EINA_FALSE); // ewk_view_show_ime_on_autofocus_set(EINA_TRUE); // elm_webview_show_magnifier_set(EINA_FALSE); - ewk_setting_enable_scripts_set(setting, EINA_TRUE); - ewk_setting_auto_load_images_set(setting, EINA_TRUE); - ewk_setting_auto_fitting_set(setting, EINA_FALSE); + ewk_settings_javascript_enabled_set(settings, EINA_TRUE); + ewk_settings_loads_images_automatically_set(settings, EINA_TRUE); + ewk_settings_auto_fitting_set(settings, EINA_FALSE); // disable zoom option when user click the input field // this option is useful with the normal website diff --git a/src/view/webkit/view_logic_geolocation_support_webkit2.cpp b/src/view/webkit/view_logic_geolocation_support_webkit2.cpp index bbbdeb0..ab7a5b5 100644 --- a/src/view/webkit/view_logic_geolocation_support_webkit2.cpp +++ b/src/view/webkit/view_logic_geolocation_support_webkit2.cpp @@ -71,9 +71,9 @@ void adjustGeolocationModuleState(const void* wkView) { bool state = getGeolocationModuleState(s_tizenId); LogDebug("Geolocation state: " << state); - Ewk_Setting* setting = ewk_view_setting_get((Evas_Object*)wkView); + Ewk_Settings* setting = ewk_view_settings_get((Evas_Object*)wkView); Assert(setting); - ewk_setting_enable_geolocation_set(setting,state); + ewk_settings_geolocation_enabled_set(setting,state); } } -- 2.7.4