From 2f68a1a5bfe3b652d3125b4ed07b07b289a23b96 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 18 Jun 2005 15:59:56 +0000 Subject: Makefile.am e-util-private.h Use EVOLUTION_IMAGESDIR and not 2005-06-18 Tor Lillqvist * Makefile.am * e-util-private.h * e-win32-reloc.c: Use EVOLUTION_IMAGESDIR and not EVOLUTION_IMAGES for consistency. Handle also SEARCH_RULE_DIR and EVOLUTION_GALVIEWSDIR. svn path=/trunk/; revision=29543 --- e-util/e-util-private.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'e-util/e-util-private.h') diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index c4f7b90e18..407e9d181d 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -31,11 +31,13 @@ const char *_e_get_localedir (void) G_GNUC_CONST; const char *_e_get_gladedir (void) G_GNUC_CONST; const char *_e_get_helpdir (void) G_GNUC_CONST; -const char *_e_get_images (void) G_GNUC_CONST; +const char *_e_get_imagesdir (void) G_GNUC_CONST; const char *_e_get_iconsdir (void) G_GNUC_CONST; const char *_e_get_category_icons (void) G_GNUC_CONST; const char *_e_get_plugindir (void) G_GNUC_CONST; const char *_e_get_privdatadir (void) G_GNUC_CONST; +const char *_e_get_search_rule_dir (void) G_GNUC_CONST; +const char *_e_get_galviewsdir (void) G_GNUC_CONST; #undef EVOLUTION_LOCALEDIR #define EVOLUTION_LOCALEDIR _e_get_localedir () @@ -49,8 +51,11 @@ const char *_e_get_privdatadir (void) G_GNUC_CONST; #undef EVOLUTION_ETSPECDIR #define EVOLUTION_ETSPECDIR _e_get_etspecdir () +#undef EVOLUTION_IMAGESDIR +#define EVOLUTION_IMAGESDIR _e_get_imagesdir () + #undef EVOLUTION_IMAGES -#define EVOLUTION_IMAGES _e_get_images () +#define EVOLUTION_IMAGES EVOLUTION_IMAGESDIR #undef EVOLUTION_ICONSDIR #define EVOLUTION_ICONSDIR _e_get_iconsdir () @@ -64,6 +69,12 @@ const char *_e_get_privdatadir (void) G_GNUC_CONST; #undef EVOLUTION_PRIVDATADIR #define EVOLUTION_PRIVDATADIR _e_get_privdatadir () +#undef SEARCH_RULE_DIR +#define SEARCH_RULE_DIR _e_get_search_rule_dir () + +#undef EVOLUTION_GALVIEWSDIR +#define EVOLUTION_GALVIEWSDIR _e_get_galviewsdir () + #endif /* G_OS_WIN32 */ #endif /* _E_UTIL_PRIVATE_H_ */ -- cgit v1.2.3