summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-01-08 13:08:10 +0200
committerYakov Goldberg <yakov.g@samsung.com>2015-01-08 13:08:10 +0200
commitde128b3f608005af7f1a387d1b6d996abff1d717 (patch)
tree2cf0a39d6f1765297ced2f49140896b3922b0145
parent69ba283a2f9d31deed8d4c3dafbf07d87166dc00 (diff)
Fix paths for installation
-rw-r--r--src/bin/main.c3
-rw-r--r--src/lib/database.c5
-rw-r--r--src/lib/database.h2
-rw-r--r--src/lib/gui_widget.c9
-rw-r--r--src/lib/gui_widget.h2
5 files changed, 13 insertions, 8 deletions
diff --git a/src/bin/main.c b/src/bin/main.c
index ae6ee45..ae409d4 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -237,8 +237,7 @@ main(int argc, char **argv)
237 goto end; 237 goto end;
238 } 238 }
239 239
240 240 if (!egui_init(PACKAGE_DATA_DIR"/config/func_names.json", PACKAGE_DATA_DIR"/config/egui_all.eo"))
241 if (!egui_init(PACKAGE_DATA_DIR"/config/func_names.json"))
242 { 241 {
243 EINA_LOG_ERR("Could not start egui"); 242 EINA_LOG_ERR("Could not start egui");
244 egui_shutdown(); 243 egui_shutdown();
diff --git a/src/lib/database.c b/src/lib/database.c
index 2fa204b..0bdceaa 100644
--- a/src/lib/database.c
+++ b/src/lib/database.c
@@ -663,7 +663,7 @@ end:
663} 663}
664 664
665Eina_Bool 665Eina_Bool
666db_init(const char *db_path) 666db_init(const char *db_path, const char *all_eo_path)
667{ 667{
668 const char *log_dom = "egui_db"; 668 const char *log_dom = "egui_db";
669 const Eina_List *itr; 669 const Eina_List *itr;
@@ -682,7 +682,8 @@ db_init(const char *db_path)
682 682
683 eo_init(); 683 eo_init();
684 684
685 eolian_eo_file_parse(PACKAGE_DATA_DIR"/config/egui_all.eo"); 685 if (!eolian_eo_file_parse(all_eo_path))
686 return EINA_FALSE;
686 687
687 Eina_Json_Value *jv, *tmp = NULL, *json_op_desc; 688 Eina_Json_Value *jv, *tmp = NULL, *json_op_desc;
688 689
diff --git a/src/lib/database.h b/src/lib/database.h
index 6fb45f3..cf2b75e 100644
--- a/src/lib/database.h
+++ b/src/lib/database.h
@@ -126,7 +126,7 @@ typedef struct _Container_Desc Container_Desc;
126#define ITEM_PUSH "item_push" 126#define ITEM_PUSH "item_push"
127 127
128Eina_Bool 128Eina_Bool
129db_init(const char *db_path); 129db_init(const char *db_path, const char *all_eo_path);
130 130
131Eina_Bool 131Eina_Bool
132db_shutdown(); 132db_shutdown();
diff --git a/src/lib/gui_widget.c b/src/lib/gui_widget.c
index 4ea54a6..7ae8139 100644
--- a/src/lib/gui_widget.c
+++ b/src/lib/gui_widget.c
@@ -808,7 +808,7 @@ gui_all_contexts_del()
808*/ 808*/
809 809
810Eina_Bool 810Eina_Bool
811egui_init(const char *db_path) 811egui_init(const char *db_path, const char *all_eo_path)
812{ 812{
813 const char *log_dom = "egui"; 813 const char *log_dom = "egui";
814 if (!db_path) 814 if (!db_path)
@@ -816,6 +816,11 @@ egui_init(const char *db_path)
816 ERR("Db file not found: \"%s\"", db_path); 816 ERR("Db file not found: \"%s\"", db_path);
817 return EINA_FALSE; 817 return EINA_FALSE;
818 } 818 }
819 if (!all_eo_path)
820 {
821 ERR("Db file not found: \"%s\"", all_eo_path);
822 return EINA_FALSE;
823 }
819 824
820 if (_egui_init_count++ > 0) 825 if (_egui_init_count++ > 0)
821 return EINA_TRUE; 826 return EINA_TRUE;
@@ -836,7 +841,7 @@ egui_init(const char *db_path)
836 eolian_directory_scan(EOLIAN_EO_DIR"/efl-1"); 841 eolian_directory_scan(EOLIAN_EO_DIR"/efl-1");
837 eolian_directory_scan(EOLIAN_EO_DIR"/elementary-1"); 842 eolian_directory_scan(EOLIAN_EO_DIR"/elementary-1");
838 843
839 if (!db_init(db_path)) 844 if (!db_init(db_path, all_eo_path))
840 return EINA_FALSE; 845 return EINA_FALSE;
841 846
842 return EINA_TRUE; 847 return EINA_TRUE;
diff --git a/src/lib/gui_widget.h b/src/lib/gui_widget.h
index f593ad8..4698f90 100644
--- a/src/lib/gui_widget.h
+++ b/src/lib/gui_widget.h
@@ -105,7 +105,7 @@ enum
105}; 105};
106 106
107Eina_Bool 107Eina_Bool
108egui_init(const char *db_path); 108egui_init(const char *db_path, const char *all_eo_path);
109 109
110Eina_Bool 110Eina_Bool
111egui_shutdown(); 111egui_shutdown();