diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-29 04:18:08 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-29 04:35:40 +0800 |
| commit | 125e67bfcb57de9a7b834475ac78ea3986e912a1 (patch) | |
| tree | 5422b2b1aff186a6634fe1591d5ee0a6d1e0af80 /mail/mail-autofilter.c | |
| parent | a73b369b72ec688c190a32952cd2d672d4eb1bf5 (diff) | |
| download | gsoc2013-evolution-125e67bfcb57de9a7b834475ac78ea3986e912a1.tar gsoc2013-evolution-125e67bfcb57de9a7b834475ac78ea3986e912a1.tar.gz gsoc2013-evolution-125e67bfcb57de9a7b834475ac78ea3986e912a1.tar.bz2 gsoc2013-evolution-125e67bfcb57de9a7b834475ac78ea3986e912a1.tar.lz gsoc2013-evolution-125e67bfcb57de9a7b834475ac78ea3986e912a1.tar.xz gsoc2013-evolution-125e67bfcb57de9a7b834475ac78ea3986e912a1.tar.zst gsoc2013-evolution-125e67bfcb57de9a7b834475ac78ea3986e912a1.zip | |
Fix where to look for filters.xml and vfolders.xml.
They live in $XDG_CONFIG_DIR/evolution/mail now.
Evolution was looking in $XDG_DATA_DIR/evolution/mail.
Diffstat (limited to 'mail/mail-autofilter.c')
| -rw-r--r-- | mail/mail-autofilter.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index f2422ce217..9095fbf14d 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -343,15 +343,15 @@ void filter_gui_add_from_message (CamelMimeMessage *msg, const gchar *source, gint flags) { EMFilterContext *fc; - const gchar *data_dir; + const gchar *config_dir; gchar *user, *system; EFilterRule *rule; g_return_if_fail (msg != NULL); fc = em_filter_context_new (); - data_dir = mail_session_get_data_dir (); - user = g_build_filename (data_dir, "filters.xml", NULL); + config_dir = mail_session_get_config_dir (); + user = g_build_filename (config_dir, "filters.xml", NULL); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); e_rule_context_load ((ERuleContext *)fc, system, user); g_free (system); @@ -369,7 +369,7 @@ void mail_filter_rename_uri(CamelStore *store, const gchar *olduri, const gchar *newuri) { EMFilterContext *fc; - const gchar *data_dir; + const gchar *config_dir; gchar *user, *system; GList *changed; gchar *eolduri, *enewuri; @@ -378,8 +378,8 @@ 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 = mail_session_get_data_dir (); - user = g_build_filename (data_dir, "filters.xml", NULL); + config_dir = mail_session_get_config_dir (); + user = g_build_filename (config_dir, "filters.xml", NULL); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); e_rule_context_load ((ERuleContext *)fc, system, user); g_free (system); @@ -403,7 +403,7 @@ void mail_filter_delete_uri(CamelStore *store, const gchar *uri) { EMFilterContext *fc; - const gchar *data_dir; + const gchar *config_dir; gchar *user, *system; GList *deleted; gchar *euri; @@ -411,8 +411,8 @@ mail_filter_delete_uri(CamelStore *store, const gchar *uri) euri = em_uri_from_camel(uri); fc = em_filter_context_new (); - data_dir = mail_session_get_data_dir (); - user = g_build_filename (data_dir, "filters.xml", NULL); + config_dir = mail_session_get_config_dir (); + user = g_build_filename (config_dir, "filters.xml", NULL); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); e_rule_context_load ((ERuleContext *)fc, system, user); g_free (system); |