From 06c3306d3c8ca75a591dcd5555b758263b220a74 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Fri, 4 Jan 2013 20:27:49 +0000 Subject: [PATCH] efl/efreet: enable locale test. export those symbols, they are harmless and will help tests. SVN revision: 82239 --- src/Makefile_Efreet.am | 8 +++++--- src/lib/efreet/efreet_private.h | 6 +++--- src/tests/efreet/ef_locale.c | 1 - src/tests/efreet/main.c | 4 ---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am index 2aff77f94a..ace11196cc 100644 --- a/src/Makefile_Efreet.am +++ b/src/Makefile_Efreet.am @@ -153,14 +153,15 @@ $(EFREET_COMMON_USER_LDADD) \ lib/efreet/libefreet_mime.la tests_efreet_efreet_test_SOURCES = \ -tests/efreet/ef_test.h \ tests/efreet/ef_data_dirs.c \ +tests/efreet/ef_desktop.c \ tests/efreet/ef_icon_theme.c \ tests/efreet/ef_ini.c \ -tests/efreet/ef_utils.c \ -tests/efreet/ef_desktop.c \ +tests/efreet/ef_locale.c \ tests/efreet/ef_menu.c \ tests/efreet/ef_mime.c \ +tests/efreet/ef_test.h \ +tests/efreet/ef_utils.c \ tests/efreet/main.c # efreet_spec_test @@ -222,6 +223,7 @@ check_PROGRAMS += tests/efreet/efreet_suite tests_efreet_efreet_suite_SOURCES = \ tests/efreet/efreet_suite.c \ +tests/efreet/efreet_suite.h \ tests/efreet/efreet_test_efreet.c \ tests/efreet/efreet_test_efreet_cache.c diff --git a/src/lib/efreet/efreet_private.h b/src/lib/efreet/efreet_private.h index 9eaa9a5c49..3863596c94 100644 --- a/src/lib/efreet/efreet_private.h +++ b/src/lib/efreet/efreet_private.h @@ -190,9 +190,9 @@ int efreet_util_shutdown(void); const char *efreet_home_dir_get(void); void efreet_dirs_reset(void); -const char *efreet_lang_get(void); -const char *efreet_lang_country_get(void); -const char *efreet_lang_modifier_get(void); +EAPI const char *efreet_lang_get(void); +EAPI const char *efreet_lang_country_get(void); +EAPI const char *efreet_lang_modifier_get(void); EAPI const char *efreet_language_get(void); size_t efreet_array_cat(char *buffer, size_t size, const char *strs[]); diff --git a/src/tests/efreet/ef_locale.c b/src/tests/efreet/ef_locale.c index cfc50e2626..f678580fef 100644 --- a/src/tests/efreet/ef_locale.c +++ b/src/tests/efreet/ef_locale.c @@ -1,5 +1,4 @@ #include "Efreet.h" -#include "efreet_private.h" #include #include #include diff --git a/src/tests/efreet/main.c b/src/tests/efreet/main.c index de6cf37add..634431b1a8 100644 --- a/src/tests/efreet/main.c +++ b/src/tests/efreet/main.c @@ -20,9 +20,7 @@ int ef_cb_efreet_icon_match(void); int ef_cb_ini_parse(void); int ef_cb_ini_long_line(void); int ef_cb_ini_garbage(void); -#if DEFAULT_VISIBILITY int ef_cb_locale(void); -#endif int ef_cb_desktop_parse(void); int ef_cb_desktop_save(void); int ef_cb_desktop_command_get(void); @@ -58,9 +56,7 @@ static Efreet_Test tests[] = { {"INI Parsing", ef_cb_ini_parse}, {"INI Long Line Parsing", ef_cb_ini_long_line}, {"INI Garbage Parsing", ef_cb_ini_garbage}, -#if DEFAULT_VISIBILITY {"Locale Parsing", ef_cb_locale}, -#endif {"Desktop Parsing", ef_cb_desktop_parse}, {"Desktop Type Parsing", ef_cb_desktop_type_parse}, {"Desktop Save", ef_cb_desktop_save},