summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Efreet.am3
-rw-r--r--src/lib/efreet/efreet_base.c4
-rw-r--r--src/tests/efreet/ef_data_dirs.c2
-rw-r--r--src/tests/efreet/ef_desktop.c16
-rw-r--r--src/tests/efreet/ef_ini.c6
-rw-r--r--src/tests/efreet/ef_menu.c10
-rw-r--r--src/tests/efreet/ef_mime.c8
7 files changed, 25 insertions, 24 deletions
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 426c64f99f..8c3a1af46c 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -23,7 +23,8 @@ EFREET_COMMON_CPPFLAGS = \
23-I$(top_builddir)/src/lib/efreet \ 23-I$(top_builddir)/src/lib/efreet \
24-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 24-DPACKAGE_BIN_DIR=\"$(bindir)\" \
25-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 25-DPACKAGE_LIB_DIR=\"$(libdir)\" \
26-DPACKAGE_DATA_DIR=\"$(datadir)\" \ 26-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
27-DDATA_DIR=\"$(datadir)\" \
27-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 28-DLOCALE_DIR=\"@LOCALE_DIR@\" \
28-DEFL_EFREET_BUILD \ 29-DEFL_EFREET_BUILD \
29@EFL_COV_CFLAGS@ \ 30@EFL_COV_CFLAGS@ \
diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c
index 9812c09dcb..e2a4bfdc2e 100644
--- a/src/lib/efreet/efreet_base.c
+++ b/src/lib/efreet/efreet_base.c
@@ -207,11 +207,11 @@ efreet_data_dirs_get(void)
207 if (xdg_data_dirs) return xdg_data_dirs; 207 if (xdg_data_dirs) return xdg_data_dirs;
208 208
209#ifdef _WIN32 209#ifdef _WIN32
210 snprintf(buf, 4096, "%s\\Efl;" PACKAGE_DATA_DIR ";/usr/share;/usr/local/share", getenv("APPDATA")); 210 snprintf(buf, 4096, "%s\\Efl;" DATA_DIR ";/usr/share;/usr/local/share", getenv("APPDATA"));
211 xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS", buf); 211 xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS", buf);
212#else 212#else
213 xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS", 213 xdg_data_dirs = efreet_dirs_get("XDG_DATA_DIRS",
214 PACKAGE_DATA_DIR ":/usr/share:/usr/local/share"); 214 DATA_DIR ":/usr/share:/usr/local/share");
215#endif 215#endif
216 return xdg_data_dirs; 216 return xdg_data_dirs;
217} 217}
diff --git a/src/tests/efreet/ef_data_dirs.c b/src/tests/efreet/ef_data_dirs.c
index a99b2ae36e..7f4bb81ae3 100644
--- a/src/tests/efreet/ef_data_dirs.c
+++ b/src/tests/efreet/ef_data_dirs.c
@@ -169,7 +169,7 @@ ef_cb_efreet_data_dirs(void)
169 unsigned int ok; 169 unsigned int ok;
170 char dirs[128], *val; 170 char dirs[128], *val;
171 char *vals[] = {"/var/tmp/a", "/tmp/b", "/usr/local/share", "/etc", NULL}; 171 char *vals[] = {"/var/tmp/a", "/tmp/b", "/usr/local/share", "/etc", NULL};
172 char *def_vals[] = {PACKAGE_DATA_DIR, "/usr/share", "/usr/local/share", NULL}; 172 char *def_vals[] = {DATA_DIR, "/usr/share", "/usr/local/share", NULL};
173 173
174 dirs[0] = '\0'; 174 dirs[0] = '\0';
175 for (i = 0; vals[i]; i++) 175 for (i = 0; vals[i]; i++)
diff --git a/src/tests/efreet/ef_desktop.c b/src/tests/efreet/ef_desktop.c
index d386b38b17..97036963b5 100644
--- a/src/tests/efreet/ef_desktop.c
+++ b/src/tests/efreet/ef_desktop.c
@@ -17,7 +17,7 @@ ef_cb_desktop_parse(void)
17 Eina_List *l; 17 Eina_List *l;
18 int ret = 1; 18 int ret = 1;
19 19
20 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop"); 20 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
21 if (!desktop) 21 if (!desktop)
22 { 22 {
23 printf("No desktop found.\n"); 23 printf("No desktop found.\n");
@@ -80,7 +80,7 @@ ef_cb_desktop_file_id(void)
80 Efreet_Desktop *desktop; 80 Efreet_Desktop *desktop;
81 int ret = 1; 81 int ret = 1;
82 82
83 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop"); 83 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
84 if (desktop) 84 if (desktop)
85 { 85 {
86 const char *id; 86 const char *id;
@@ -92,10 +92,10 @@ ef_cb_desktop_file_id(void)
92 char *prefix; 92 char *prefix;
93 char *expected; 93 char *expected;
94 } tests[] = { 94 } tests[] = {
95 {PACKAGE_DATA_DIR"/efreet/test/", 0, NULL, "test.desktop"}, 95 {PACKAGE_DATA_DIR"/test/", 0, NULL, "test.desktop"},
96 {PACKAGE_DATA_DIR"/efreet/", 0, NULL, "test-test.desktop"}, 96 {PACKAGE_DATA_DIR"/", 0, NULL, "test-test.desktop"},
97 {PACKAGE_DATA_DIR"/efreet/", 1, NULL, "test.desktop"}, 97 {PACKAGE_DATA_DIR"/", 1, NULL, "test.desktop"},
98 {PACKAGE_DATA_DIR"/efreet/", 1, "prefix", "prefix-test.desktop"}, 98 {PACKAGE_DATA_DIR"/", 1, "prefix", "prefix-test.desktop"},
99 {NULL, 0, NULL, NULL} 99 {NULL, 0, NULL, NULL}
100 }; 100 };
101 101
@@ -126,7 +126,7 @@ ef_cb_desktop_save(void)
126 Efreet_Desktop *desktop; 126 Efreet_Desktop *desktop;
127 127
128 printf("\n"); 128 printf("\n");
129 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop"); 129 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
130 if (!desktop) 130 if (!desktop)
131 { 131 {
132 printf("Failed to get Desktop file\n"); 132 printf("Failed to get Desktop file\n");
@@ -376,7 +376,7 @@ ef_cb_desktop_type_parse(void)
376 my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL, 376 my_type = efreet_desktop_type_add("My_Type", cb_type_parse, NULL,
377 (Efreet_Desktop_Type_Free_Cb)free); 377 (Efreet_Desktop_Type_Free_Cb)free);
378 378
379 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test_type.desktop"); 379 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test_type.desktop");
380 if (!desktop) 380 if (!desktop)
381 { 381 {
382 printf("No desktop found.\n"); 382 printf("No desktop found.\n");
diff --git a/src/tests/efreet/ef_ini.c b/src/tests/efreet/ef_ini.c
index 13a3aa1467..d31fb456f8 100644
--- a/src/tests/efreet/ef_ini.c
+++ b/src/tests/efreet/ef_ini.c
@@ -12,7 +12,7 @@ ef_cb_ini_parse(void)
12 12
13 putenv("LC_ALL=en_US"); 13 putenv("LC_ALL=en_US");
14 14
15 ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test.ini"); 15 ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/test.ini");
16 if (!ini) 16 if (!ini)
17 { 17 {
18 printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n"); 18 printf("efreet_ini_parse() Failed to initialize Efreet_Ini\n");
@@ -115,7 +115,7 @@ ef_cb_ini_long_line(void)
115 {NULL, 0} 115 {NULL, 0}
116 }; 116 };
117 117
118 ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/long.ini"); 118 ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/long.ini");
119 if (!ini) 119 if (!ini)
120 { 120 {
121 printf("Ini failed to parse.\n"); 121 printf("Ini failed to parse.\n");
@@ -162,7 +162,7 @@ ef_cb_ini_garbage(void)
162 Efreet_Ini *ini; 162 Efreet_Ini *ini;
163 int ret = 1; 163 int ret = 1;
164 164
165 ini = efreet_ini_new(PACKAGE_DATA_DIR"/efreet/test/test_garbage"); 165 ini = efreet_ini_new(PACKAGE_DATA_DIR"/test/test_garbage");
166 if (!ini) 166 if (!ini)
167 { 167 {
168 printf("Ini failed to parse.\n"); 168 printf("Ini failed to parse.\n");
diff --git a/src/tests/efreet/ef_menu.c b/src/tests/efreet/ef_menu.c
index be42f128a3..4adbd941c0 100644
--- a/src/tests/efreet/ef_menu.c
+++ b/src/tests/efreet/ef_menu.c
@@ -32,7 +32,7 @@ ef_cb_menu_get(void)
32 Efreet_Menu *menu; 32 Efreet_Menu *menu;
33 33
34 menu = efreet_menu_get(); 34 menu = efreet_menu_get();
35// menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu"); 35// menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
36 if (!menu) 36 if (!menu)
37 { 37 {
38 printf("efreet_menu_get() returned NULL\n"); 38 printf("efreet_menu_get() returned NULL\n");
@@ -50,7 +50,7 @@ ef_cb_menu_with_slashes(void)
50{ 50{
51 Efreet_Menu *menu; 51 Efreet_Menu *menu;
52 52
53 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test_menu_slash_bad.menu"); 53 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test_menu_slash_bad.menu");
54 if (menu) 54 if (menu)
55 { 55 {
56 printf("efreet_menu_get() didn't return NULL\n"); 56 printf("efreet_menu_get() didn't return NULL\n");
@@ -67,7 +67,7 @@ ef_cb_menu_save(void)
67 int ret; 67 int ret;
68 68
69// menu = efreet_menu_get(); 69// menu = efreet_menu_get();
70 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu"); 70 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
71 if (!menu) 71 if (!menu)
72 { 72 {
73 printf("efreet_menu_get() returned NULL\n"); 73 printf("efreet_menu_get() returned NULL\n");
@@ -86,7 +86,7 @@ ef_cb_menu_edit(void)
86 Efreet_Desktop *desktop; 86 Efreet_Desktop *desktop;
87 87
88// menu = efreet_menu_get(); 88// menu = efreet_menu_get();
89 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/efreet/test/test.menu"); 89 menu = efreet_menu_parse(PACKAGE_DATA_DIR"/test/test.menu");
90 if (!menu) 90 if (!menu)
91 { 91 {
92 printf("efreet_menu_get() returned NULL\n"); 92 printf("efreet_menu_get() returned NULL\n");
@@ -98,7 +98,7 @@ ef_cb_menu_edit(void)
98 printf("\n"); 98 printf("\n");
99#endif 99#endif
100 100
101 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/efreet/test/test.desktop"); 101 desktop = efreet_desktop_get(PACKAGE_DATA_DIR"/test/test.desktop");
102 if (!desktop) 102 if (!desktop)
103 { 103 {
104 efreet_menu_free(menu); 104 efreet_menu_free(menu);
diff --git a/src/tests/efreet/ef_mime.c b/src/tests/efreet/ef_mime.c
index 84a8b8f341..18f36b024c 100644
--- a/src/tests/efreet/ef_mime.c
+++ b/src/tests/efreet/ef_mime.c
@@ -19,10 +19,10 @@ ef_mime_cb_get(void)
19 char *file; 19 char *file;
20 char *mime; 20 char *mime;
21 } files[] = { 21 } files[] = {
22 {PACKAGE_DATA_DIR"/efreet/test/test_type.desktop", "application/x-desktop"}, 22 {PACKAGE_DATA_DIR"/test/test_type.desktop", "application/x-desktop"},
23 {PACKAGE_DATA_DIR"/efreet/test/entry.png", "image/png"}, 23 {PACKAGE_DATA_DIR"/test/entry.png", "image/png"},
24 {PACKAGE_DATA_DIR"/efreet/test/entry", "image/png"}, 24 {PACKAGE_DATA_DIR"/test/entry", "image/png"},
25 {PACKAGE_DATA_DIR"/efreet/test/sub", "inode/directory"}, 25 {PACKAGE_DATA_DIR"/test/sub", "inode/directory"},
26 {NULL, NULL} 26 {NULL, NULL}
27 }; 27 };
28 double start; 28 double start;