aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog4
-rw-r--r--e-util/Makefile.am4
-rw-r--r--e-util/e-util-private.h15
-rw-r--r--e-util/e-win32-reloc.c12
4 files changed, 27 insertions, 8 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 30244d3f8e..400025dce7 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -6,8 +6,8 @@
scratch.
(INCLUDES) Remove GAL_IMAGESDIR, unused leftover. Add the
definitions of EVOLUTION_GLADEDIR, EVOLUTION_HELPDIR,
- EVOLUTION_ETSPECDIR (for e-win32-reloc.c). Remove undefined
- GNOME_INCLUDEDIR.
+ EVOLUTION_ETSPECDIR, SEARCH_RULE_DIR and EVOLUTION_GALVIEWSDIR
+ (for e-win32-reloc.c). Remove undefined GNOME_INCLUDEDIR.
(libeutil_la_LDFLAGS, libeconduit_la_LDFLAGS): Use NO_UNDEFINED.
(libeutil_la_LIBADD, libeconduit_la_LIBADD): Link with necessary
libs.
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index fe9618ca22..0dc3ed77ba 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -13,12 +13,14 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \
-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
-DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \
+ -DSEARCH_RULE_DIR=\"$(ruledir)\" \
-DG_LOG_DOMAIN=\"e-utils\" \
$(GNOME_PILOT_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
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_ */
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)