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

Fix the elm_shutdown bug in _elm_shutdown_config. 

When the elm_shutdown is used after elm_config_all_flush, the segment fault occur.
It's why it uses ecore_x in _prop_all_update_cb after removing it.
This commit is contained in:
Jaehwan Kim 2013-03-19 19:42:34 +09:00
parent 7916fc6a88
commit 67bb9078f6
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/ChangeLog
View File

@ -1161,3 +1161,9 @@
2013-03-18 WooHyun Jung
* Focus highlight should be reconfigured when theme is changed.
2013-03-19 Jaehwan Kim
* Fix the elm_shutdown bug in _elm_shutdown_config.
When the elm_shutdown is used after elm_config_all_flush, the segment fault occur.
It's why it uses ecore_x in _prop_all_update_cb after removing it.

1
legacy/elementary/NEWS
View File

@ -186,6 +186,7 @@ Fixes:
* Fixed a bug in elm_list. Focus_next is needed only when access mode is enabled.
* Fix a memory leak of elm_genlist - EINA_LIST_FREE should be used for returned value of elm_genlist_realized_items_get
* Focus highlight should be reconfigured when theme is changed.
* Fix the elm_shutdown bug in _elm_shutdown_config.
Removals:

22
legacy/elementary/src/lib/elm_config.c
View File

@ -2260,6 +2260,17 @@ _elm_config_init(void)
void
_elm_config_sub_shutdown(void)
{
#ifdef HAVE_ELEMENTARY_X
if (_prop_all_update_timer)
{
ecore_timer_del(_prop_all_update_timer);
_prop_all_update_timer = NULL;
_prop_all_update_cb(NULL);
}
if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer);
_prop_change_delay_timer = NULL;
#endif
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
@ -2412,17 +2423,6 @@ _elm_config_profile_set(const char *profile)
void
_elm_config_shutdown(void)
{
#ifdef HAVE_ELEMENTARY_X
if (_prop_all_update_timer)
{
ecore_timer_del(_prop_all_update_timer);
_prop_all_update_timer = NULL;
_prop_all_update_cb(NULL);
}
if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer);
_prop_change_delay_timer = NULL;
#endif
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||