diff options
author | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-17 00:27:12 +0800 |
---|---|---|
committer | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-17 01:10:02 +0800 |
commit | 968ea42023e5e0daf860a7246533311a67f77e05 (patch) | |
tree | b68bd7c80b48c09e332b45c9e3b4ed98fd68efd9 /mail/mail-autofilter.c | |
parent | 3a0a795a167ed33eaa6a9a73b0edeb854aef6f0f (diff) | |
download | gsoc2013-evolution-968ea42023e5e0daf860a7246533311a67f77e05.tar gsoc2013-evolution-968ea42023e5e0daf860a7246533311a67f77e05.tar.gz gsoc2013-evolution-968ea42023e5e0daf860a7246533311a67f77e05.tar.bz2 gsoc2013-evolution-968ea42023e5e0daf860a7246533311a67f77e05.tar.lz gsoc2013-evolution-968ea42023e5e0daf860a7246533311a67f77e05.tar.xz gsoc2013-evolution-968ea42023e5e0daf860a7246533311a67f77e05.tar.zst gsoc2013-evolution-968ea42023e5e0daf860a7246533311a67f77e05.zip |
Kill em_utils_get_data/config_dir(), push down to MailSession
This pushes the get_data_dir() API down to the right level. At present, it is
still implemented by querying the shell backend for the data dir / config dir.
But this should eventually be reversed (when mail is split off to EDS) so that
the mail daemon is the one responsible for the storage locations and the shell
backend queries the daemon for these values.
Diffstat (limited to 'mail/mail-autofilter.c')
-rw-r--r-- | mail/mail-autofilter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index bbb3694ee8..8117bfca6a 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -32,6 +32,7 @@ #include "mail-vfolder.h" #include "mail-autofilter.h" +#include "mail-session.h" #include "em-utils.h" #include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" @@ -352,7 +353,7 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const gchar *source, gint fl g_return_if_fail (msg != NULL); fc = em_filter_context_new (); - data_dir = em_utils_get_data_dir (); + data_dir = mail_session_get_data_dir (); user = g_build_filename (data_dir, "filters.xml", NULL); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); e_rule_context_load ((ERuleContext *)fc, system, user); @@ -380,7 +381,7 @@ mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newu enewuri = em_uri_from_camel(newuri); fc = em_filter_context_new (); - data_dir = em_utils_get_data_dir (); + data_dir = mail_session_get_data_dir (); user = g_build_filename (data_dir, "filters.xml", NULL); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); e_rule_context_load ((ERuleContext *)fc, system, user); @@ -413,7 +414,7 @@ mail_filter_delete_uri(CamelStore *store, const gchar *uri) euri = em_uri_from_camel(uri); fc = em_filter_context_new (); - data_dir = em_utils_get_data_dir (); + data_dir = mail_session_get_data_dir (); user = g_build_filename (data_dir, "filters.xml", NULL); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); e_rule_context_load ((ERuleContext *)fc, system, user); |