From b110450e6d393ee61e03e3951d08dff0d43958ae Mon Sep 17 00:00:00 2001 From: "y0.kim" Date: Thu, 21 Jan 2016 18:37:45 +0900 Subject: [PATCH] Fix warnings in ewk/efl_webview_app/mini_browser.c This patch fix 9 warnings in mini_browser.c > passing argument 1 of 'ewk_context_vibration_client_callbacks_set' from incompatible pointer type > passing argument 3 of 'evas_object_smart_callback_add' from incompatible pointer type > initialization from incompatible pointer type > (near initialization for 'values[0].strp') > assignment from incompatible pointer typen > unused variable 'permissionRequest' [-Wunused-variable] > implicit declaration of function 'ewk_start_tracing' [-Wimplicit-function-declaration] > implicit declaration of function 'ewk_stop_tracing' [-Wimplicit-function-declaration] Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15558 Reviewed by: sns.park Change-Id: Iac5fe427fbde3b2093cce95c4651ac6c8261ee31 Signed-off-by: y0.kim --- tizen_src/ewk/efl_integration/public/ewk_tracing.h | 3 ++- tizen_src/ewk/efl_webview_app/mini_browser.c | 20 ++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tizen_src/ewk/efl_integration/public/ewk_tracing.h b/tizen_src/ewk/efl_integration/public/ewk_tracing.h index f01b8d7..f60911f 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_tracing.h +++ b/tizen_src/ewk/efl_integration/public/ewk_tracing.h @@ -6,7 +6,8 @@ #define ewk_tracing_h #include -#include + +#include "ewk_export.h" #ifdef __cplusplus extern "C" { diff --git a/tizen_src/ewk/efl_webview_app/mini_browser.c b/tizen_src/ewk/efl_webview_app/mini_browser.c index b1090ad..6a19378 100644 --- a/tizen_src/ewk/efl_webview_app/mini_browser.c +++ b/tizen_src/ewk/efl_webview_app/mini_browser.c @@ -27,11 +27,12 @@ #include "public/ewk_context.h" #include "public/ewk_context_menu.h" #include "public/ewk_error.h" +#include "public/ewk_geolocation.h" #include "public/ewk_main.h" #include "public/ewk_policy_decision.h" -#include "public/ewk_geolocation.h" -#include "public/ewk_view.h" +#include "public/ewk_tracing.h" #include "public/ewk_user_media.h" +#include "public/ewk_view.h" #include "browser-string.h" #include "browser-object.h" @@ -55,7 +56,7 @@ static haptic_effect_h s_haptic_effect; // haptic_effect struct. #endif static const char default_start_url[] = "http://www.google.com/"; -static const char* start_url = NULL; +static char* start_url = NULL; static int is_imf_shown = 0; //Added for SIP status static int im_context_status = 0; @@ -319,7 +320,7 @@ Evas_Object* _create_view(Evas_Object *parent, app_data *data) { if (start_url == NULL) { - start_url = default_start_url; + start_url = (char*)default_start_url; } int width, height; @@ -355,7 +356,7 @@ Evas_Object* _create_view(Evas_Object *parent, app_data *data) #if defined(OS_TIZEN_MOBILE) printf("[%s][%d][%s] calling ewk_context_vibration_client_callbacks_set...\n", __FUNCTION__, __LINE__, "vibration"); - ewk_context_vibration_client_callbacks_set(webview, __vibration_on_cb, __vibration_off_cb, NULL); + ewk_context_vibration_client_callbacks_set((Ewk_Context*) webview, __vibration_on_cb, __vibration_off_cb, NULL); #endif //Added to support keyboard backspace key @@ -367,7 +368,7 @@ Evas_Object* _create_view(Evas_Object *parent, app_data *data) enable_customize_contextmenu(data, EINA_TRUE); #if defined(OS_TIZEN_MOBILE) - evas_object_smart_callback_add(webview, "inputmethod,changed", _imf_panel_changed_cb , data); + evas_object_smart_callback_add(webview, "inputmethod,changed", (Evas_Smart_Cb) _imf_panel_changed_cb , data); #endif return webview; @@ -683,13 +684,12 @@ static bool __br_app_create(void *data) //#endif return true; } -static bool __br_app_terminate(void* data) +static void __br_app_terminate(void* data) { #if defined(OS_TIZEN_TV) curr_focus = NULL; hide_imf_panel(data); #endif - return true; } static void __br_app_pause(void* data) @@ -973,8 +973,6 @@ void __geolocation_permission_request_cb(void *data, Evas_Object *obj, void *eve // Callback for Allow button press for media request void _usermedia_ok_cb (void *data, Evas_Object *obj, void *event_info) { - Ewk_User_Media_Permission_Request* permissionRequest= - (Ewk_User_Media_Permission_Request*)event_info; app_data* ad = (app_data*)data; ewk_user_media_permission_request_set(ad->userMediaRequest,EINA_TRUE); __popup_close(ad); @@ -984,8 +982,6 @@ void _usermedia_ok_cb (void *data, Evas_Object *obj, void *event_info) void _usermedia_cancel_cb (void *data, Evas_Object *obj, void *event_info) { app_data* ad = (app_data*)data; - Ewk_User_Media_Permission_Request* permissionRequest= - (Ewk_User_Media_Permission_Request*)event_info; ewk_user_media_permission_request_set(ad->userMediaRequest,EINA_FALSE); __popup_close(ad); } -- 2.7.4