diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-12-18 16:24:26 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-12-18 16:24:26 +0800 |
| commit | 448d624c00f0c4e12917a4d31babd10555b2e8a4 (patch) | |
| tree | c44c6e6864f1e0cd34455da2e71fc33ca13d61e6 /mail/mail-autofilter.c | |
| parent | 2f1a024be76933ba28ab80e76a52ff46358e33dd (diff) | |
| download | gsoc2013-evolution-448d624c00f0c4e12917a4d31babd10555b2e8a4.tar.gz gsoc2013-evolution-448d624c00f0c4e12917a4d31babd10555b2e8a4.tar.zst gsoc2013-evolution-448d624c00f0c4e12917a4d31babd10555b2e8a4.zip | |
em-folder-browser.c em-folder-view.c em-format-html.c
2005-12-18 Tor Lillqvist <tml@novell.com>
* em-folder-browser.c
* em-folder-view.c
* em-format-html.c
* em-format-html-display.c
* em-mailer-prefs.c
* em-message-browser.c
* em-migrate.c
* em-subscribe-editor.c
* em-sync-stream.c
* em-utils.c
* em-vfolder-editor.c
* em-vfolder-rule.c
* mail-autofilter.c
* mail-component.c
* mail-config.c
* mail-folder-cache.c: Use gstdio wrappers. Construct pathnames of
glade, xml, etspec and png files at run-time. Use
g_filename_{to,from}_uri().
* em-folder-browser.c (emfb_init)
* em-folder-view.c (emfv_finalise)
* em-message-browser.c (emmb_init): As EMFolderView::ui_files now
always is a list of filenames constructed with g_build_filename(),
use g_free() on each list entry before calling g_slist_free() on
the list.
* em-folder-tree-model.c (em_folder_tree_model_load_state): Use
e_xml_parse_file().
* em-migrate.c: Bypass all the code for upgrading from 1.x on Win32.
(emm_setup_initial): Use GDir instead of dirent.
* em-sync-stream.c
* mail-folder-cache.c: Use pthread_equal() to compare pthread_t
values.
* em-vfs-stream.c: No EINPROGRESS or ELOOP on Win32.
svn path=/trunk/; revision=30854
Diffstat (limited to 'mail/mail-autofilter.c')
| -rw-r--r-- | mail/mail-autofilter.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index ffba4ba084..f02c8134de 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -42,6 +42,7 @@ #include "mail-component.h" #include "em-utils.h" #include "e-util/e-error.h" +#include "e-util/e-util-private.h" #include "em-vfolder-context.h" #include "em-vfolder-rule.h" @@ -360,8 +361,10 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag fc = em_filter_context_new (); user = g_strdup_printf ("%s/mail/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); - system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; + system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); rule_context_load ((RuleContext *)fc, system, user); + g_free (system); + rule = filter_rule_from_message (fc, msg, flags); filter_rule_set_source (rule, source); @@ -384,8 +387,9 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri fc = em_filter_context_new (); user = g_strdup_printf ("%s/mail/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); - system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; + system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); rule_context_load ((RuleContext *)fc, system, user); + g_free (system); changed = rule_context_rename_uri((RuleContext *)fc, eolduri, enewuri, g_str_equal); if (changed) { @@ -414,8 +418,9 @@ mail_filter_delete_uri(CamelStore *store, const char *uri) fc = em_filter_context_new (); user = g_strdup_printf ("%s/mail/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); - system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; + system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); rule_context_load ((RuleContext *)fc, system, user); + g_free (system); deleted = rule_context_delete_uri ((RuleContext *) fc, euri, g_str_equal); if (deleted) { |