summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2014-01-22 10:47:03 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-01-22 10:54:58 +0900
commit0d520bed357f0f721000ea22574d81ac41a6e271 (patch)
tree14bfef9b88c5b995a994bad5cc8c646738a19962
parent907fc5c590751a304f1d6bc5a247f12cc64e48ca (diff)
elm: Removed unnecessary null check for ecore_event_handler_del.
-rw-r--r--src/lib/elm_config.c3
-rw-r--r--src/lib/elm_conform.c2
-rw-r--r--src/lib/elm_icon.c4
-rw-r--r--src/lib/elm_main.c6
4 files changed, 5 insertions, 10 deletions
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 87e35e37f..4cdc9b38c 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -2685,8 +2685,7 @@ _elm_config_shutdown(void)
2685#undef ENGINE_COMPARE 2685#undef ENGINE_COMPARE
2686 { 2686 {
2687#ifdef HAVE_ELEMENTARY_X 2687#ifdef HAVE_ELEMENTARY_X
2688 ecore_event_handler_del(_prop_change_handler); 2688 ELM_SAFE_FREE(_prop_change_handler, ecore_event_handler_del);
2689 _prop_change_handler = NULL;
2690#endif 2689#endif
2691 } 2690 }
2692 ELM_SAFE_FREE(_elm_config, _config_free); 2691 ELM_SAFE_FREE(_elm_config, _config_free);
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index d487db0c9..65bd5f79b 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -924,7 +924,7 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
924 Elm_Conformant_Smart_Data *sd = _pd; 924 Elm_Conformant_Smart_Data *sd = _pd;
925 925
926#ifdef HAVE_ELEMENTARY_X 926#ifdef HAVE_ELEMENTARY_X
927 if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl); 927 ecore_event_handler_del(sd->prop_hdl);
928#endif 928#endif
929 929
930 ecore_job_del(sd->show_region_job); 930 ecore_job_del(sd->show_region_job);
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 533de873f..53663c561 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -601,9 +601,7 @@ _elm_icon_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
601 eina_stringshare_del(sd->thumb.file.key); 601 eina_stringshare_del(sd->thumb.file.key);
602 eina_stringshare_del(sd->thumb.thumb.path); 602 eina_stringshare_del(sd->thumb.thumb.path);
603 eina_stringshare_del(sd->thumb.thumb.key); 603 eina_stringshare_del(sd->thumb.thumb.key);
604 604 ecore_event_handler_del(sd->thumb.eeh);
605 if (sd->thumb.eeh)
606 ecore_event_handler_del(sd->thumb.eeh);
607 605
608 _edje_signals_free(sd); 606 _edje_signals_free(sd);
609 607
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index c4da84f1a..81734e530 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -326,10 +326,8 @@ elm_shutdown(void)
326 _elm_init_count--; 326 _elm_init_count--;
327 if (_elm_init_count > 0) return _elm_init_count; 327 if (_elm_init_count > 0) return _elm_init_count;
328 328
329 if (system_handlers[0]) 329 ecore_event_handler_del(system_handlers[0]);
330 ecore_event_handler_del(system_handlers[0]); 330 ecore_event_handler_del(system_handlers[1]);
331 if (system_handlers[1])
332 ecore_event_handler_del(system_handlers[1]);
333 331
334 _elm_win_shutdown(); 332 _elm_win_shutdown();
335 while (_elm_win_deferred_free) ecore_main_loop_iterate(); 333 while (_elm_win_deferred_free) ecore_main_loop_iterate();