nikawhite pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=4cf4501bbcfd5428c7e901482330db4656448c32
commit 4cf4501bbcfd5428c7e901482330db4656448c32
Author: Mykyta Biliavskyi <m.biliavs...@samsung.com>
Date: Tue Aug 9 21:23:26 2016 +0300
Prject manager: remove pm_project_thread_free API.
From this time all internal resources are freed inside
project manager. And this managed only inside internal flow.
---
src/bin/main.c | 1 -
src/bin/project_manager/project_manager.c | 32 -------------------------------
src/bin/project_manager/project_manager.h | 10 ----------
src/bin/ui/project_close.c | 1 -
src/bin/ui/tab_home_import_edc.c | 1 -
src/bin/ui/tab_home_import_edj.c | 1 -
src/bin/ui/tab_home_new.c | 1 -
src/bin/ui/tab_home_open.c | 1 -
8 files changed, 48 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 1881b15..479cd17 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -93,7 +93,6 @@ _setup_open_splash(void *data, Splash_Status status
__UNUSED__)
static Eina_Bool
_teardown_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__)
{
- pm_project_thread_free();
return true;
}
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index 73c06ab..cc5363a 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -33,31 +33,6 @@
#define THREAD_CONTEXT_SWITCH_END ecore_thread_main_loop_end()
static Eet_Compression compess_level = EET_COMPRESSION_HI;
-static Project_Thread worker;
-#define WORKER_CREATE(FUNC_PROGRESS, FUNC_END, DATA, PROJECT, \
- NAME, PATH, EDJ, EDC, BUILD_OPTIONS, WIDGET_LIST) \
-{ \
- worker.func_progress = FUNC_PROGRESS; \
- worker.func_end = FUNC_END; \
- worker.data = (void *)DATA; \
- worker.project = PROJECT; \
- worker.result = PM_PROJECT_LAST; \
- worker.name = eina_stringshare_add(NAME); \
- worker.path = eina_stringshare_add(PATH); \
- worker.edj = eina_stringshare_add(EDJ); \
- worker.edc = eina_stringshare_add(EDC); \
- worker.build_options = eina_stringshare_add(BUILD_OPTIONS); \
- worker.widgets = WIDGET_LIST; \
-}
-
-#define WORKER_FREE() \
-{ \
- eina_stringshare_del(worker.name); \
- eina_stringshare_del(worker.path); \
- eina_stringshare_del(worker.edj); \
- eina_stringshare_del(worker.edc); \
- eina_stringshare_del(worker.build_options); \
-}
static Eina_Bool
_project_dev_file_create(Project *pro)
@@ -452,13 +427,6 @@ pm_project_thread_cancel()
return false;
}
-Eina_Bool
-pm_project_thread_free()
-{
- WORKER_FREE();
- return true;
-}
-
void
pm_project_open(const char *path,
PM_Project_Progress_Cb func_progress,
diff --git a/src/bin/project_manager/project_manager.h
b/src/bin/project_manager/project_manager.h
index 81f3fe0..1ef254c 100644
--- a/src/bin/project_manager/project_manager.h
+++ b/src/bin/project_manager/project_manager.h
@@ -182,16 +182,6 @@ typedef void
(* PM_Project_End_Cb)(void *data, PM_Project_Result result, Project *project);
/**
- * Free the Project Thread object.
- *
- * @return EINA_TRUE on success, EINA_FALSE if thread running.
- *
- * @ingroup ProjectManager
- */
-Eina_Bool
-pm_project_thread_free(void);
-
-/**
* Create a new project which based on the imported edj file.
*
* @param name The name of new project;
diff --git a/src/bin/ui/project_close.c b/src/bin/ui/project_close.c
index 68a8363..bf3ce32 100644
--- a/src/bin/ui/project_close.c
+++ b/src/bin/ui/project_close.c
@@ -115,7 +115,6 @@ _teardown_save_splash(void *data __UNUSED__, Splash_Status
status)
STATUSBAR_PROJECT_SAVE_TIME_UPDATE();
ap.project->changed = false;
- pm_project_thread_free();
return true;
}
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index 1208f4d..ccd5d26 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -399,7 +399,6 @@ _setup_open_splash(void *data __UNUSED__, Splash_Status
status __UNUSED__)
static Eina_Bool
_teardown_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__)
{
- pm_project_thread_free();
ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false);
return true;
}
diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c
index 03a1668..511b177 100644
--- a/src/bin/ui/tab_home_import_edj.c
+++ b/src/bin/ui/tab_home_import_edj.c
@@ -444,7 +444,6 @@ _setup_open_splash(void *data __UNUSED__, Splash_Status
status __UNUSED__)
static Eina_Bool
_teardown_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__)
{
- pm_project_thread_free();
ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false);
return true;
}
diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c
index f8f245b..d5dc0f1 100644
--- a/src/bin/ui/tab_home_new.c
+++ b/src/bin/ui/tab_home_new.c
@@ -492,7 +492,6 @@ _setup_open_splash(void *data __UNUSED__, Splash_Status
status __UNUSED__)
static Eina_Bool
_teardown_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__)
{
- pm_project_thread_free();
ecore_file_recursive_rm(tab_new.tmp_dir_path);
eina_stringshare_del(tab_new.tmp_dir_path);
tab_new.tmp_dir_path = NULL;
diff --git a/src/bin/ui/tab_home_open.c b/src/bin/ui/tab_home_open.c
index 5eb5d78..97744a0 100644
--- a/src/bin/ui/tab_home_open.c
+++ b/src/bin/ui/tab_home_open.c
@@ -58,7 +58,6 @@ _setup_open_splash(void *data, Splash_Status status
__UNUSED__)
static Eina_Bool
_teardown_open_splash(void *data __UNUSED__, Splash_Status status __UNUSED__)
{
- pm_project_thread_free();
return true;
}
--
