hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=2d9f86a30d20c2816c8544a2d72bd5e791c6f083
commit 2d9f86a30d20c2816c8544a2d72bd5e791c6f083 Author: ChunEon Park <her...@hermet.pe.kr> Date: Tue Jun 9 15:40:30 2015 +0900 autocomp: fix the resoucre directory path auto_comp data is the library resource rather than application. use the eina prefix rather then app data path. --- src/include/globals.h | 1 + src/lib/auto_comp.c | 4 +++- src/lib/enventor_main.c | 8 ++++---- src/lib/enventor_private.h | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/include/globals.h b/src/include/globals.h index df92df4..13e023e 100644 --- a/src/include/globals.h +++ b/src/include/globals.h @@ -1,2 +1,3 @@ extern const char *DEFAULT_EDC_FORMAT; extern char EDJE_PATH[PATH_MAX]; +extern Eina_Prefix *PREFIX; diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c index 17f8786..755d0e3 100644 --- a/src/lib/auto_comp.c +++ b/src/lib/auto_comp.c @@ -61,7 +61,9 @@ static void autocomp_load(autocomp_data *ad) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "%s/autocomp/autocomp.eet", elm_app_data_dir_get()); + snprintf(buf, sizeof(buf), "%s/autocomp/autocomp.eet", + eina_prefix_data_get(PREFIX)); + if (ad->source_file) { if (lex_desc) diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c index e558aeb..9af30f7 100644 --- a/src/lib/enventor_main.c +++ b/src/lib/enventor_main.c @@ -7,6 +7,7 @@ #include "enventor_private.h" char EDJE_PATH[PATH_MAX]; +Eina_Prefix *PREFIX = NULL; const char SIG_CURSOR_LINE_CHANGED[] = "cursor,line,changed"; const char SIG_CURSOR_GROUP_CHANGED[]= "cursor,group,changed"; const char SIG_LIVE_VIEW_LOADED[] = "live_view,loaded"; @@ -23,7 +24,6 @@ const char SIG_FOCUSED[] = "focused"; static int _enventor_init_count = 0; static int _enventor_log_dom = -1; static Ecore_Event_Handler *_key_down_handler = NULL; -static Eina_Prefix *pfx = NULL; static Eina_Bool key_down_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev) @@ -95,12 +95,12 @@ enventor_init(int argc, char **argv) _enventor_log_dom = EINA_LOG_DOMAIN_GLOBAL; } - pfx = eina_prefix_new(NULL, enventor_init, "ENVENTOR", "enventor", NULL, + PREFIX = eina_prefix_new(NULL, enventor_init, "ENVENTOR", "enventor", NULL, PACKAGE_BIN_DIR, PACKAGE_LIB_DIR, PACKAGE_DATA_DIR, PACKAGE_DATA_DIR); snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj", - eina_prefix_data_get(pfx)); + eina_prefix_data_get(PREFIX)); srand(time(NULL)); _key_down_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, @@ -128,7 +128,7 @@ enventor_shutdown(void) eina_log_domain_unregister(_enventor_log_dom); _enventor_log_dom = -1; } - eina_prefix_free(pfx); + eina_prefix_free(PREFIX); elm_shutdown(); eio_shutdown(); diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h index 34fa7ac..b072cc1 100644 --- a/src/lib/enventor_private.h +++ b/src/lib/enventor_private.h @@ -1,6 +1,8 @@ #ifndef __ENVENTOR_PRIVATE_H__ #define __ENVENTOR_PRIVATE_H__ +#include "common.h" + #define QUOT """ #define QUOT_LEN 6 #define QUOT_UTF8 "\"" @@ -17,7 +19,6 @@ #define VIEW_DATA edj_mgr_view_get(NULL) #define ATTR_VALUE_MAX_CNT 4 -extern char EDJE_PATH[PATH_MAX]; extern const char SIG_CURSOR_LINE_CHANGED[]; extern const char SIG_CURSOR_GROUP_CHANGED[]; extern const char SIG_MAX_LINE_CHANGED[]; --