rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=924f3f05f72df0bb03dd9069eb078bca72b62eaa
commit 924f3f05f72df0bb03dd9069eb078bca72b62eaa Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Fri Sep 30 16:30:44 2016 +0300 tabs: check the return value from project manager Change-Id: I6bfe93cec217e4e1f6209ba2c5cabc1f3090ad6d --- src/bin/ui/tab_home_import_edc.c | 6 ++++-- src/bin/ui/tab_home_import_edj.c | 16 +++++++++------- src/bin/ui/tab_home_new.c | 16 +++++++++------- src/bin/ui/tab_home_open.c | 4 +++- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c index 9817e9a..ec3e3f3 100644 --- a/src/bin/ui/tab_home_import_edc.c +++ b/src/bin/ui/tab_home_import_edc.c @@ -382,16 +382,18 @@ static Eina_Bool _setup_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__) { Eina_Bool ret = true; + PM_Project_Result result; Eina_Strbuf *flags = _edje_cc_opt_build(); eina_strbuf_reset(tab_edc.log); - if (!pm_project_import_edc(elm_entry_entry_get(tab_edc.name), + result = pm_project_import_edc(elm_entry_entry_get(tab_edc.name), elm_entry_entry_get(tab_edc.path), elm_entry_entry_get(tab_edc.edc), eina_strbuf_string_get(flags), _progress_print, _progress_end, - &tab_edc.meta)) + &tab_edc.meta); + if (PM_PROJECT_SUCCESS != result) ret = false; eina_strbuf_free(flags); diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c index 8e80934..304ea0a 100644 --- a/src/bin/ui/tab_home_import_edj.c +++ b/src/bin/ui/tab_home_import_edj.c @@ -437,13 +437,15 @@ static Eina_Bool _setup_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__) { Eina_Bool ret = true; - if (!pm_project_import_edj(elm_entry_entry_get(tab_edj.name), - elm_entry_entry_get(tab_edj.path), - elm_entry_entry_get(tab_edj.edj), - tab_edj.widget_list, - progress_print, - _progress_end, - &tab_edj.meta)) + PM_Project_Result result; + result = pm_project_import_edj(elm_entry_entry_get(tab_edj.name), + elm_entry_entry_get(tab_edj.path), + elm_entry_entry_get(tab_edj.edj), + tab_edj.widget_list, + progress_print, + _progress_end, + &tab_edj.meta); + if (PM_PROJECT_SUCCESS != result) ret = false; return ret; diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c index e600203..edae7c7 100644 --- a/src/bin/ui/tab_home_new.c +++ b/src/bin/ui/tab_home_new.c @@ -453,6 +453,7 @@ _setup_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__) Eina_Strbuf *edc, *flags; Eina_Stringshare *edc_path; FILE *fp; + PM_Project_Result result; if (!eina_file_mkdtemp("eflete_project_XXXXXX", &tmp_dir)) { @@ -480,13 +481,14 @@ _setup_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__) eina_strbuf_append_printf(flags, "-id \"%s/template/images\" -sd \"%s/template/sounds\" -v", ap.path.edj_path, ap.path.edj_path); - if (!pm_project_import_edc(elm_entry_entry_get(tab_new.name), - elm_entry_entry_get(tab_new.path), - edc_path, - eina_strbuf_string_get(flags), - progress_print, - _progress_end, - &tab_new.meta)) + result = pm_project_import_edc(elm_entry_entry_get(tab_new.name), + elm_entry_entry_get(tab_new.path), + edc_path, + eina_strbuf_string_get(flags), + progress_print, + _progress_end, + &tab_new.meta); + if (PM_PROJECT_SUCCESS != result) ret = false; eina_strbuf_free(flags); diff --git a/src/bin/ui/tab_home_open.c b/src/bin/ui/tab_home_open.c index 9bf85fa..1ae6373 100644 --- a/src/bin/ui/tab_home_open.c +++ b/src/bin/ui/tab_home_open.c @@ -47,10 +47,12 @@ _setup_open_splash(void *data, Splash_Status status __UNUSED__) { Eina_Bool ret = true; Eina_Stringshare *path = data; + PM_Project_Result result; assert(path != NULL); - if (!pm_project_open(path, progress_print, _tabs_progress_end, NULL)) + result = pm_project_open(path, progress_print, _tabs_progress_end, NULL); + if (PM_PROJECT_SUCCESS != result) ret = false; eina_stringshare_del(path); --