nikawhite pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ba572fed622776f501a4ddee59eda69ddbc2c54e
commit ba572fed622776f501a4ddee59eda69ddbc2c54e Author: Mykyta Biliavskyi <m.biliavs...@samsung.com> Date: Tue Aug 9 16:58:05 2016 +0300 Project manager: usage Project_Thread instead worker. Updated signature and code of _project_edj_file_copy and _copy_meta_data_to_pro internal functions for usage Projec_Thread instead worker. --- src/bin/project_manager/project_manager.c | 14 +++++++------- src/bin/project_manager/project_manager_import_edj.c | 12 ++++-------- src/bin/project_manager/project_manager_private.h | 4 ++-- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/bin/project_manager/project_manager.c b/src/bin/project_manager/project_manager.c index 6a93791..39b6cae 100644 --- a/src/bin/project_manager/project_manager.c +++ b/src/bin/project_manager/project_manager.c @@ -357,21 +357,21 @@ _project_files_create(Project_Thread *ptd) #undef MKDIR void -_copy_meta_data_to_pro(void) +_copy_meta_data_to_pro(Project_Thread *ptd) { Eet_File *ef; char *name, *authors, *version, *license, *comment; - ef = eet_open(worker.edj, EET_FILE_MODE_READ_WRITE); + ef = eet_open(ptd->edj, EET_FILE_MODE_READ_WRITE); - name = strdup(worker.name); + name = strdup(ptd->name); authors = eet_read(ef, PROJECT_KEY_AUTHORS, NULL); version = eet_read(ef, PROJECT_KEY_FILE_VERSION, NULL); license = eet_read(ef, PROJECT_KEY_LICENSE, NULL); comment = eet_read(ef, PROJECT_KEY_COMMENT, NULL); eet_close(ef); - pm_project_meta_data_set(worker.project, name, authors, + pm_project_meta_data_set(ptd->project, name, authors, version, license, comment); if (name) free(name); @@ -382,13 +382,13 @@ _copy_meta_data_to_pro(void) } Eina_Bool -_project_edj_file_copy(void) +_project_edj_file_copy(Project_Thread *ptd) { Eina_Stringshare *src, *dst; Eina_Bool result; - src = eina_stringshare_ref(worker.edj); - dst = eina_stringshare_ref(worker.project->saved_edj); + src = eina_stringshare_ref(ptd->edj); + dst = eina_stringshare_ref(ptd->project->saved_edj); result = ecore_file_cp(src, dst); DBG("Copy the .edj file to project folder."); diff --git a/src/bin/project_manager/project_manager_import_edj.c b/src/bin/project_manager/project_manager_import_edj.c index 03d298a..599ce27 100644 --- a/src/bin/project_manager/project_manager_import_edj.c +++ b/src/bin/project_manager/project_manager_import_edj.c @@ -61,10 +61,8 @@ _edje_pick_end_cb(void *data, return ECORE_CALLBACK_DONE; } - /* Replace void with ptd */ - _project_edj_file_copy(); - /* Replace void with ptd */ - _copy_meta_data_to_pro(); + _project_edj_file_copy(ptd); + _copy_meta_data_to_pro(ptd); _project_special_group_add(ptd->project); _project_dummy_image_add(ptd->project); _project_open_internal(ptd); @@ -180,10 +178,8 @@ _project_import_edj(void *data) ptd->func_progress(NULL, msg); eina_stringshare_del(msg); - /* Replace void with ptd */ - _project_edj_file_copy(); - /* Replace void with ptd */ - _copy_meta_data_to_pro(); + _project_edj_file_copy(ptd); + _copy_meta_data_to_pro(ptd); _project_special_group_add(ptd->project); _project_dummy_image_add(ptd->project); _project_open_internal(ptd); diff --git a/src/bin/project_manager/project_manager_private.h b/src/bin/project_manager/project_manager_private.h index db642cc..451b2b1 100644 --- a/src/bin/project_manager/project_manager_private.h +++ b/src/bin/project_manager/project_manager_private.h @@ -150,12 +150,12 @@ void _project_special_group_add(Project *project); void _project_dummy_image_add(Project *project); /* Copy current edj file into path, that stored for save */ -Eina_Bool _project_edj_file_copy(void); +Eina_Bool _project_edj_file_copy(Project_Thread *ptd); /* Direct read meta data from eet file and copy it * inside *.pro file. */ -void _copy_meta_data_to_pro(void); +void _copy_meta_data_to_pro(Project_Thread *ptd); /* Allocate Project structure and prepare data * for files tree of project. --