stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=7bf389f3a7a3bf8dc73c44fe883a648b8196087b

commit 7bf389f3a7a3bf8dc73c44fe883a648b8196087b
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Mar 27 16:02:39 2018 -0400

    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 <ste...@osg.samsung.com>
---
 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 71e698c623..f042be9373 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 aac2e6f517..1096f1a3be 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -122,26 +122,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;
@@ -871,7 +851,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 37c83467c8..fc67a74fc7 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -531,9 +531,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,

-- 


Reply via email to