From 733afdd6779815117183a3dac9deec3617c7824c Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Wed, 27 Jan 2016 18:48:47 +0100 Subject: [PATCH] remove c-compiler warnings. Change-Id: I781282dd835d8d53325201a981bd63943283326d Signed-off-by: Lukasz Stanislawski --- src/dynamic_index.c | 4 ++-- src/homescreen-efl.c | 28 ---------------------------- src/key.c | 1 + 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/src/dynamic_index.c b/src/dynamic_index.c index cd6712c..c364040 100644 --- a/src/dynamic_index.c +++ b/src/dynamic_index.c @@ -237,7 +237,7 @@ static void __dynamic_index_page_count_changed_cb(void *data, Evas_Object *obj, HAPI double _dist(int current, int page_x, int page_width) { - return 1.0-((double)fabs(page_x-current))/page_width; + return 1.0-((double)fabs((float)page_x-current))/page_width; } static void __dynamic_index_page_area_changed_cb(void *data, Evas_Object *obj, void *event_info) @@ -257,7 +257,7 @@ static void __dynamic_index_page_area_changed_cb(void *data, Evas_Object *obj, v angle = (double)(x - dynamic_index->x_current)/dynamic_index->page_width * 90.0; - if(fabs(x - dynamic_index->x_current) <= dynamic_index->page_width) + if(fabs((float)(x - dynamic_index->x_current)) <= dynamic_index->page_width) { next_page = x > dynamic_index->x_current ? (dynamic_index->page_current+1) % dynamic_index->page_count : dynamic_index->page_current-1; color = fabs(angle) * 2; diff --git a/src/homescreen-efl.c b/src/homescreen-efl.c index 31c39c0..6dfcaf2 100644 --- a/src/homescreen-efl.c +++ b/src/homescreen-efl.c @@ -280,34 +280,6 @@ static void __homescreen_efl_win_delete_request_cb(void *data, Evas_Object *obj, ui_app_exit(); } -static Evas_Object *_create_conformant(void) -{ - Evas_Object *conformant = NULL; - - if (!s_info.win) { - LOGE("Window is not created"); - return NULL; - } - - conformant = elm_conformant_add(s_info.win); - if (!conformant) { - LOGE("Failed to create conformant"); - return NULL; - } - elm_win_conformant_set(s_info.win, EINA_TRUE); - - evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(s_info.win, conformant); - - elm_win_indicator_mode_set(s_info.win, ELM_WIN_INDICATOR_SHOW); - elm_win_indicator_opacity_set(s_info.win, ELM_WIN_INDICATOR_TRANSLUCENT); - elm_object_signal_emit(conformant, "elm,state,indicator,overlap", "elm"); - - evas_object_show(conformant); - - return conformant; -} - static void __homescreen_efl_create_base_gui(void) { char edj_path[PATH_MAX] = {0, }; diff --git a/src/key.c b/src/key.c index ff40f72..3fd68dc 100644 --- a/src/key.c +++ b/src/key.c @@ -152,6 +152,7 @@ static Eina_Bool __key_release_cb(void *data, int type, void *event) case HOMESCREEN_VIEW_ALL_APPS_CHOOSE: folder_panel_cancel_add_icon(); folder_panel_set_click_ignore_state(false); + break; case HOMESCREEN_VIEW_ALL_APPS_EDIT: home_screen_set_view_type(HOMESCREEN_VIEW_ALL_APPS); break; -- 2.7.4