enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

elm_main.c: ELM_SAFE_FREE adoption. 

I splited ELM_SAFE_FREE refactoring patches. One commit per each file as recommended.
For the detail, please refer 3072dab12f12fe83fb5a628d15efd5cded11787f.

In this commit, I used ELM_SAFE_FREE even inside shutdown function.
This commit is contained in:
Daniel Juyung Seo 2013-05-29 21:00:40 +09:00
parent 1c1da31da3
commit f7449d9ea5
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
legacy/elementary/src/lib/elm_main.c
View File

@ -312,17 +312,8 @@ elm_shutdown(void)
_elm_clouseau_unload();
// wrningz :(
// _prefix_shutdown();
if (app_name)
{
eina_stringshare_del(app_name);
app_name = NULL;
}
if (app_desktop_entry)
{
eina_stringshare_del(app_desktop_entry);
app_desktop_entry = NULL;
}
ELM_SAFE_FREE(app_name, eina_stringshare_del);
ELM_SAFE_FREE(app_desktop_entry, eina_stringshare_del);
elm_quicklaunch_sub_shutdown();
elm_quicklaunch_shutdown();
@ -735,18 +726,13 @@ elm_quicklaunch_shutdown(void)
if (pfx) eina_prefix_free(pfx);
pfx = NULL;
eina_stringshare_del(_elm_data_dir);
_elm_data_dir = NULL;
eina_stringshare_del(_elm_lib_dir);
_elm_lib_dir = NULL;
free(_elm_appname);
_elm_appname = NULL;
ELM_SAFE_FREE(_elm_data_dir, eina_stringshare_del);
ELM_SAFE_FREE(_elm_lib_dir, eina_stringshare_del);
ELM_SAFE_FREE(_elm_appname, free);
_elm_config_shutdown();
ecore_event_handler_del(_elm_exit_handler);
_elm_exit_handler = NULL;
ELM_SAFE_FREE(_elm_exit_handler, ecore_event_handler_del);
_elm_theme_shutdown();
_elm_unneed_systray();