aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog15
-rw-r--r--mail/Makefile.am1
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/mail-autofilter.c6
-rw-r--r--mail/mail-callbacks.c2
-rw-r--r--mail/mail-search-dialogue.c2
-rw-r--r--mail/mail-session.c2
-rw-r--r--mail/mail-summary.c2
-rw-r--r--mail/mail-vfolder.c2
9 files changed, 25 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index dac9a081cb..9e335a4339 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,20 @@
2003-02-06 Dan Winship <danw@ximian.com>
+ * Makefile.am (INCLUDES): add EVOLUTION_PRIVDATADIR
+
+ * component-factory.c (owner_set_cb): Use EVOLUTION_PRIVDATADIR
+ * mail-autofilter.c (filter_gui_add_from_message): Likewise
+ (mail_filter_rename_uri): Likewise
+ (mail_filter_delete_uri): Likewise
+ * mail-callbacks.c (filter_edit): Likewise.
+ * mail-search-dialogue.c (mail_search_dialogue_construct):
+ Likewise
+ * mail-session.c (main_get_filter_driver): Likewise
+ * mail-summary.c (generate_folder_summaries): Likewise
+ * mail-vfolder.c (vfolder_load_storage): Likewise
+
+2003-02-06 Dan Winship <danw@ximian.com>
+
* Makefile.am: Remove *dir defs that are in configure.in now
(INCLUDES): clean up using new *dir variables
(libevolution_mail_la_LDFLAGS): remove -export-dynamic, add
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 89ff12ecfb..eec87d15c8 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -22,6 +22,7 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend \
$(EVOLUTION_MAIL_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 1716b2393d..9783283c81 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -799,7 +799,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
{
/* setup the global quick-search context */
char *user = g_strdup_printf ("%s/searches.xml", evolution_dir);
- char *system = g_strdup (EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml");
+ char *system = g_strdup (EVOLUTION_PRIVDATADIR "/vfoldertypes.xml");
search_context = rule_context_new ();
g_object_set_data_full(G_OBJECT(search_context), "user", user, g_free);
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index c934bb44b0..f396b00d43 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -314,7 +314,7 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
+ system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
rule = filter_rule_from_message (fc, msg, flags);
@@ -335,7 +335,7 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
+ system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
changed = rule_context_rename_uri((RuleContext *)fc, olduri, newuri, uri_cmp);
@@ -360,7 +360,7 @@ mail_filter_delete_uri(CamelStore *store, const char *uri)
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
+ system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
deleted = rule_context_delete_uri ((RuleContext *) fc, uri, uri_cmp);
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 7957121f10..c606301440 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -2754,7 +2754,7 @@ filter_edit (BonoboUIComponent *uih, void *user_data, const char *path)
fc = filter_context_new ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
+ system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
rule_context_load ((RuleContext *)fc, system, user);
g_free (user);
diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c
index 8a6580d2e9..a00eaa0f92 100644
--- a/mail/mail-search-dialogue.c
+++ b/mail/mail-search-dialogue.c
@@ -89,7 +89,7 @@ mail_search_dialogue_construct (MailSearchDialogue *o, FilterRule *rule)
o->context = rule_context_new ();
rule_context_add_part_set (o->context, "partset", filter_part_get_type (),
rule_context_add_part, rule_context_next_part);
- rule_context_load (o->context, EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml", "");
+ rule_context_load (o->context, EVOLUTION_PRIVDATADIR "/vfoldertypes.xml", "");
if (rule) {
o->rule = rule;
o->guts = filter_rule_get_widget (o->rule, o->context);
diff --git a/mail/mail-session.c b/mail/mail-session.c
index fadf2c2e0f..259e845fe5 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -767,7 +767,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException
gconf = gconf_client_get_default ();
user = g_strdup_printf ("%s/filters.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/filtertypes.xml";
+ system = EVOLUTION_PRIVDATADIR "/filtertypes.xml";
fc = (RuleContext *) filter_context_new ();
rule_context_load (fc, system, user);
g_free (user);
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
index 3d833d2fac..abac927977 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -296,7 +296,7 @@ generate_folder_summaries (MailSummary *summary)
int i;
user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
- system = EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml";
+ system = EVOLUTION_PRIVDATADIR "/vfoldertypes.xml";
context = vfolder_context_new ();
rule_context_load ((RuleContext *)context, system, user);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index a64105b511..b75bdf1d59 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -779,7 +779,7 @@ vfolder_load_storage(GNOME_Evolution_Shell shell)
user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
context = vfolder_context_new ();
if (rule_context_load ((RuleContext *)context,
- EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/vfoldertypes.xml", user) != 0) {
+ EVOLUTION_PRIVDATADIR "/vfoldertypes.xml", user) != 0) {
g_warning("cannot load vfolders: %s\n", ((RuleContext *)context)->error);
}
g_free (user);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:34:36 +0800