forked from enlightenment/efl
elm: Removed unnecessary null check for ecore_event_handler_del.
This commit is contained in:
parent
db5fe2581d
commit
0c3c2572b9
|
@ -2685,8 +2685,7 @@ _elm_config_shutdown(void)
|
||||||
#undef ENGINE_COMPARE
|
#undef ENGINE_COMPARE
|
||||||
{
|
{
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
ecore_event_handler_del(_prop_change_handler);
|
ELM_SAFE_FREE(_prop_change_handler, ecore_event_handler_del);
|
||||||
_prop_change_handler = NULL;
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
ELM_SAFE_FREE(_elm_config, _config_free);
|
ELM_SAFE_FREE(_elm_config, _config_free);
|
||||||
|
|
|
@ -924,7 +924,7 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
Elm_Conformant_Smart_Data *sd = _pd;
|
Elm_Conformant_Smart_Data *sd = _pd;
|
||||||
|
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl);
|
ecore_event_handler_del(sd->prop_hdl);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ecore_job_del(sd->show_region_job);
|
ecore_job_del(sd->show_region_job);
|
||||||
|
|
|
@ -601,9 +601,7 @@ _elm_icon_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
eina_stringshare_del(sd->thumb.file.key);
|
eina_stringshare_del(sd->thumb.file.key);
|
||||||
eina_stringshare_del(sd->thumb.thumb.path);
|
eina_stringshare_del(sd->thumb.thumb.path);
|
||||||
eina_stringshare_del(sd->thumb.thumb.key);
|
eina_stringshare_del(sd->thumb.thumb.key);
|
||||||
|
ecore_event_handler_del(sd->thumb.eeh);
|
||||||
if (sd->thumb.eeh)
|
|
||||||
ecore_event_handler_del(sd->thumb.eeh);
|
|
||||||
|
|
||||||
_edje_signals_free(sd);
|
_edje_signals_free(sd);
|
||||||
|
|
||||||
|
|
|
@ -326,10 +326,8 @@ elm_shutdown(void)
|
||||||
_elm_init_count--;
|
_elm_init_count--;
|
||||||
if (_elm_init_count > 0) return _elm_init_count;
|
if (_elm_init_count > 0) return _elm_init_count;
|
||||||
|
|
||||||
if (system_handlers[0])
|
ecore_event_handler_del(system_handlers[0]);
|
||||||
ecore_event_handler_del(system_handlers[0]);
|
ecore_event_handler_del(system_handlers[1]);
|
||||||
if (system_handlers[1])
|
|
||||||
ecore_event_handler_del(system_handlers[1]);
|
|
||||||
|
|
||||||
_elm_win_shutdown();
|
_elm_win_shutdown();
|
||||||
while (_elm_win_deferred_free) ecore_main_loop_iterate();
|
while (_elm_win_deferred_free) ecore_main_loop_iterate();
|
||||||
|
|
Loading…
Reference in New Issue