From 8a9e5c18d10cf770ecf824e08b80e785441e1f76 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 27 Mar 2018 16:02:39 -0400 Subject: [PATCH] elm: remove hacky calls to emotion_init/shutdown these are irrelevant since emotion manages init/shutdown internally fixes elm test pass state Reviewed-by: Stefan Schmidt --- src/lib/elementary/efl_ui_video.c | 1 - src/lib/elementary/elm_main.c | 21 --------------------- src/lib/elementary/elm_priv.h | 3 --- 3 files changed, 25 deletions(-) diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index 71e698c..f042be9 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -219,7 +219,6 @@ EOLIAN static void _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - _elm_emotion_init(); if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "video"); diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index 98bda64..6f2a289 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -125,26 +125,6 @@ _elm_rescale(void) _elm_ews_wm_rescale(NULL, EINA_FALSE); } -static Eina_Bool _emotion_inited = EINA_FALSE; - -void -_elm_emotion_init(void) -{ - if (_emotion_inited) return ; - - emotion_init(); - _emotion_inited = EINA_TRUE; -} - -void -_elm_emotion_shutdown(void) -{ - if (!_emotion_inited) return ; - - emotion_shutdown(); - _emotion_inited = EINA_FALSE; -} - static void *app_mainfunc = NULL; static const char *app_name = NULL; static const char *app_desktop_entry = NULL; @@ -897,7 +877,6 @@ elm_quicklaunch_shutdown(void) #ifdef HAVE_ELEMENTARY_EMAP emap_shutdown(); #endif - _elm_emotion_shutdown(); ecore_file_shutdown(); eio_shutdown(); diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index cde5942..46c55fc 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -542,9 +542,6 @@ void _elm_prefs_shutdown(void); void _elm_prefs_data_init(void); void _elm_prefs_data_shutdown(void); -void _elm_emotion_init(void); -void _elm_emotion_shutdown(void); - int _elm_ews_wm_init(void); void _elm_ews_wm_shutdown(void); void _elm_ews_wm_rescale(Elm_Theme *th, -- 2.7.4