kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <stefan@osg.samsung.com>
This commit is contained in:
Mike Blumenkrantz 2018-03-27 16:02:39 -04:00 committed by Stefan Schmidt
parent 73106cc201
commit 7bf389f3a7
3 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/elementary/efl_ui_video.c
View File

@ -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");

21
src/lib/elementary/elm_main.c
View File

@ -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();

3
src/lib/elementary/elm_priv.h
View File

@ -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,