summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Williams <andy@andywilliams.me>2016-03-22 13:10:04 +0000
committerAndy Williams <andy@andywilliams.me>2016-03-22 13:10:04 +0000
commit30bf19285fcdb1d183a8a603c8176c358bb0aaf5 (patch)
tree576834a75342d33fd024f9cbc92fd23bb5cda23e
parentd689266254966212fece19850daf97585ddf0014 (diff)
downloadefl-30bf19285fcdb1d183a8a603c8176c358bb0aaf5.tar.gz
Fix the local lookup of diffs in the test app.
This is not portable but I think it's a temporary app anyhow
-rw-r--r--legacy/elm_code/src/bin/Makefile.am1
-rw-r--r--legacy/elm_code/src/bin/elm_code_test_main.c12
2 files changed, 3 insertions, 10 deletions
diff --git a/legacy/elm_code/src/bin/Makefile.am b/legacy/elm_code/src/bin/Makefile.am
index c71bf8b893..58105bcfc7 100644
--- a/legacy/elm_code/src/bin/Makefile.am
+++ b/legacy/elm_code/src/bin/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/elm_code/src/lib/ \
-I$(top_builddir)/elm_code/src/lib/ \
-DLOCALEDIR=\"$(datadir)/locale\" \
+-DDATA_DIR=\"$(abspath $(srcdir))/../tests/\" \
-DEFL_BETA_API_SUPPORT \
@EFL_CFLAGS@
diff --git a/legacy/elm_code/src/bin/elm_code_test_main.c b/legacy/elm_code/src/bin/elm_code_test_main.c
index 5779ee77ba..b4bcf3039b 100644
--- a/legacy/elm_code/src/bin/elm_code_test_main.c
+++ b/legacy/elm_code/src/bin/elm_code_test_main.c
@@ -135,15 +135,10 @@ _elm_code_test_mirror_setup(Elm_Code *code, char *font_name, Evas_Object *parent
static Evas_Object *
_elm_code_test_diff_inline_setup(Evas_Object *parent)
{
- char path[PATH_MAX];
Evas_Object *diff;
Elm_Code *code;
- snprintf(path, sizeof(path), "%s/../edi/data/testdiff.diff", elm_app_data_dir_get());
-
code = elm_code_create();
- elm_code_file_open(code, path);
-
diff = eo_add(ELM_CODE_WIDGET_CLASS, parent, elm_obj_code_widget_code_set(eo_self, code));
evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -151,7 +146,7 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
evas_object_show(diff);
elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF);
- elm_code_file_open(code, path);
+ elm_code_file_open(code, DATA_DIR "testdiff.diff");
return diff;
}
@@ -159,14 +154,11 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
static Evas_Object *
_elm_code_test_diff_setup(Evas_Object *parent)
{
- char path[PATH_MAX];
Evas_Object *diff;
Elm_Code *code;
- snprintf(path, sizeof(path), "%s/../edi/data/testdiff.diff", elm_app_data_dir_get());
-
code = elm_code_create();
- elm_code_file_open(code, path);
+ elm_code_file_open(code, DATA_DIR "testdiff.diff");
diff = elm_code_diff_widget_add(parent, code);
return diff;