devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=364323881cb229036774200637411094bb02cc9b
commit 364323881cb229036774200637411094bb02cc9b Author: Vincent Torri <vincent.to...@gmail.com> Date: Thu Sep 17 16:26:59 2020 +0000 elm_config: remove useless init|shutdown of ecore_win32 and eocore_cocoa (done in ecore_evas module), and useless wayland variable ecore_win32 and ecore_cocoa was init. wayland variable was also unused Reviewed-by: Christopher Michael <devilho...@comcast.net> Differential Revision: https://phab.enlightenment.org/D12149 --- src/lib/elementary/elm_config.c | 16 ---------------- src/lib/elementary/elm_priv.h | 4 ---- 2 files changed, 20 deletions(-) diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 96384d37e9..7a1a966e09 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -42,10 +42,6 @@ static Eio_Monitor *_eio_profile_monitor = NULL; Eina_Hash *_elm_key_bindings = NULL; -#ifdef HAVE_ELEMENTARY_WL2 -Ecore_Wl2_Display *_elm_wl_display = NULL; -#endif - const char *_elm_engines[] = { "software_x11", "fb", @@ -4318,12 +4314,6 @@ _elm_config_sub_shutdown(void) { ecore_event_type_flush(ELM_EVENT_CONFIG_ALL_CHANGED); -#ifdef HAVE_ELEMENTARY_COCOA - ecore_cocoa_shutdown(); -#endif -#ifdef HAVE_ELEMENTARY_WIN32 - ecore_win32_shutdown(); -#endif ELM_SAFE_FREE(_eio_config_monitor, eio_monitor_del); ELM_SAFE_FREE(_eio_profile_monitor, eio_monitor_del); ELM_SAFE_FREE(_config_change_delay_timer, ecore_timer_del); @@ -4414,12 +4404,6 @@ _elm_config_file_monitor_cb(void *data EINA_UNUSED, void _elm_config_sub_init(void) { -#ifdef HAVE_ELEMENTARY_COCOA - ecore_cocoa_init(); -#endif -#ifdef HAVE_ELEMENTARY_WIN32 - ecore_win32_init(); -#endif char buf[PATH_MAX]; int ok = 0; diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 146f2f8c53..fe7b65297d 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -904,10 +904,6 @@ extern Eina_Bool _config_profile_lock; extern Eina_FreeQ *postponed_fq; -# ifdef HAVE_ELEMENTARY_WL2 -extern Ecore_Wl2_Display *_elm_wl_display; -# endif - # ifdef ENABLE_NLS /* Our gettext wrapper, used to disable translation of elm if the app * is not translated. */ --