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-win32-reloc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'e-util/e-win32-reloc.c') diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index c85d695fa6..3cb394eb77 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -38,11 +38,13 @@ static const char *localedir = NULL; static const char *gladedir; static const char *helpdir; static const char *etspecdir; -static const char *images; +static const char *imagesdir; static const char *iconsdir; static const char *category_icons; static const char *plugindir; static const char *privdatadir; +static const char *search_rule_dir; +static const char *galviewsdir; static HMODULE hmodule; G_LOCK_DEFINE_STATIC (mutex); @@ -100,10 +102,12 @@ setup (void) gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR); helpdir = replace_prefix (full_prefix, EVOLUTION_HELPDIR); etspecdir = replace_prefix (full_prefix, EVOLUTION_ETSPECDIR); - images = replace_prefix (full_prefix, EVOLUTION_IMAGES); + imagesdir = replace_prefix (full_prefix, EVOLUTION_IMAGESDIR); category_icons = replace_prefix (full_prefix, EVOLUTION_CATEGORY_ICONS); plugindir = replace_prefix (full_prefix, EVOLUTION_PLUGINDIR); privdatadir = replace_prefix (full_prefix, EVOLUTION_PRIVDATADIR); + search_rule_dir = replace_prefix (full_prefix, SEARCH_RULE_DIR); + galviewsdir = replace_prefix (full_prefix, EVOLUTION_GALVIEWSDIR); g_free (full_prefix); G_UNLOCK (mutex); @@ -123,8 +127,10 @@ GETTER(localedir) GETTER(gladedir) GETTER(helpdir) GETTER(etspecdir) -GETTER(images) +GETTER(imagesdir) GETTER(iconsdir) GETTER(category_icons) GETTER(plugindir) GETTER(privdatadir) +GETTER(search_rule_dir) +GETTER(galviewsdir) -- cgit