From 0c3c2572b96e8949d2deb46dc366192bc644b66e Mon Sep 17 00:00:00 2001
From: Daniel Juyung Seo <seojuyung2@gmail.com>
Date: Wed, 22 Jan 2014 10:47:03 +0900
Subject: [PATCH] elm: Removed unnecessary null check for
 ecore_event_handler_del.

---
 legacy/elementary/src/lib/elm_config.c  | 3 +--
 legacy/elementary/src/lib/elm_conform.c | 2 +-
 legacy/elementary/src/lib/elm_icon.c    | 4 +---
 legacy/elementary/src/lib/elm_main.c    | 6 ++----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/legacy/elementary/src/lib/elm_config.c b/legacy/elementary/src/lib/elm_config.c
index 87e35e37f5..4cdc9b38cc 100644
--- a/legacy/elementary/src/lib/elm_config.c
+++ b/legacy/elementary/src/lib/elm_config.c
@@ -2685,8 +2685,7 @@ _elm_config_shutdown(void)
 #undef ENGINE_COMPARE
      {
 #ifdef HAVE_ELEMENTARY_X
-        ecore_event_handler_del(_prop_change_handler);
-        _prop_change_handler = NULL;
+        ELM_SAFE_FREE(_prop_change_handler, ecore_event_handler_del);
 #endif
      }
    ELM_SAFE_FREE(_elm_config, _config_free);
diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c
index d487db0c9f..65bd5f79b7 100644
--- a/legacy/elementary/src/lib/elm_conform.c
+++ b/legacy/elementary/src/lib/elm_conform.c
@@ -924,7 +924,7 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    Elm_Conformant_Smart_Data *sd = _pd;
 
 #ifdef HAVE_ELEMENTARY_X
-   if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl);
+   ecore_event_handler_del(sd->prop_hdl);
 #endif
 
    ecore_job_del(sd->show_region_job);
diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c
index 533de873fd..53663c5610 100644
--- a/legacy/elementary/src/lib/elm_icon.c
+++ b/legacy/elementary/src/lib/elm_icon.c
@@ -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.thumb.path);
    eina_stringshare_del(sd->thumb.thumb.key);
-
-   if (sd->thumb.eeh)
-     ecore_event_handler_del(sd->thumb.eeh);
+   ecore_event_handler_del(sd->thumb.eeh);
 
    _edje_signals_free(sd);
 
diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c
index c4da84f1a7..81734e530f 100644
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@@ -326,10 +326,8 @@ elm_shutdown(void)
    _elm_init_count--;
    if (_elm_init_count > 0) return _elm_init_count;
 
-   if (system_handlers[0])
-     ecore_event_handler_del(system_handlers[0]);
-   if (system_handlers[1])
-     ecore_event_handler_del(system_handlers[1]);
+   ecore_event_handler_del(system_handlers[0]);
+   ecore_event_handler_del(system_handlers[1]);
 
    _elm_win_shutdown();
    while (_elm_win_deferred_free) ecore_main_loop_iterate();