/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 Hiroyuki Yamamoto & The Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#include "defs.h"
#include "prefs_gtk.h"
#include "compose.h"
#include "prefs_common.h"
-#include "addrbook.h"
+#include "addritem.h"
+#ifndef USE_NEW_ADDRBOOK
+ #include "addrbook.h"
+ #include "addressbook.h"
+#else
+ #include "addressbook-dbus.h"
+ #include "addressadd.h"
+#endif
#include "addr_compl.h"
#include "tags.h"
#include "log.h"
+#include "account.h"
+#include "addrindex.h"
+#include "folder_item_prefs.h"
GSList * pre_global_processing = NULL;
GSList * post_global_processing = NULL;
static gboolean filtering_is_final_action(FilteringAction *filtering_action);
-#define STRLEN_WITH_CHECK(expr) \
- strlen_with_check(#expr, __LINE__, expr)
-
-static inline gint strlen_with_check(const gchar *expr, gint fline, const gchar *str)
-{
- if (str)
- return strlen(str);
- else {
- debug_print("%s(%d) - invalid string %s\n", __FILE__, fline, expr?expr:"(null)");
- return 0;
- }
-}
-
FilteringAction * filteringaction_new(int type, int account_id,
gchar * destination,
gint labelcolor, gint score, gchar * header)
g_free(action);
}
+static gint action_list_sort(gconstpointer a, gconstpointer b)
+{
+ int first = filtering_is_final_action((FilteringAction *) a) ? 1 : 0;
+ int second = filtering_is_final_action((FilteringAction *) b) ? 1 : 0;
+
+ return (first - second);
+}
+
+GSList *filtering_action_list_sort(GSList *action_list)
+{
+ return g_slist_sort(action_list, action_list_sort);
+}
+
FilteringProp * filteringprop_new(gboolean enabled,
const gchar *name,
gint account_id,
filtering->name = name ? g_strdup(name): NULL;
filtering->account_id = account_id;
filtering->matchers = matchers;
- filtering->action_list = action_list;
+ filtering->action_list = filtering_action_list_sort(action_list);
return filtering;
}
switch(action->type) {
case MATCHACTION_MOVE:
+ if (MSG_IS_LOCKED(info->flags))
+ return FALSE;
+
dest_folder =
folder_find_item_from_identifier(action->destination);
if (!dest_folder) {
case MATCHACTION_MARK_AS_UNREAD:
FLUSH_COPY_IF_NEEDED(info);
- procmsg_msginfo_set_flags(info, MSG_UNREAD, 0);
+ procmsg_msginfo_change_flags(info, MSG_UNREAD, 0, MSG_NEW, 0);
return TRUE;
case MATCHACTION_MARK_AS_SPAM:
FLUSH_COPY_IF_NEEDED(info);
procmsg_spam_learner_learn(info, NULL, TRUE);
procmsg_msginfo_change_flags(info, MSG_SPAM, 0, MSG_NEW|MSG_UNREAD, 0);
- if (procmsg_spam_get_folder(info)) {
- info->filter_op = IS_MOVE;
- info->to_filter_folder = procmsg_spam_get_folder(info);
- }
return TRUE;
case MATCHACTION_MARK_AS_HAM:
case MATCHACTION_ADD_TO_ADDRESSBOOK:
{
+#ifndef USE_NEW_ADDRBOOK
AddressDataSource *book = NULL;
AddressBookFile *abf = NULL;
ItemFolder *folder = NULL;
+#endif
gchar buf[BUFFSIZE];
Header *header;
gint errors = 0;
+#ifndef USE_NEW_ADDRBOOK
if (!addressbook_peek_folder_exists(action->destination, &book, &folder)) {
g_warning("addressbook folder not found '%s'\n", action->destination?action->destination:"(null)");
return FALSE;
}
abf = book->rawDataSource;
-
+#endif
/* get the header */
- procheader_get_header_from_msginfo(info, buf, sizeof(buf), action->header);
+ if (procheader_get_header_from_msginfo(info, buf,
+ sizeof(buf), action->header) < 0)
+ return FALSE;
+
header = procheader_parse_header(buf);
/* add all addresses that are not already in */
extract_address(stripped_addr);
if (complete_matches_found(walk->data) == 0) {
+ gchar *name = procheader_get_fromname(walk->data);
debug_print("adding address '%s' to addressbook '%s'\n",
stripped_addr, action->destination);
- if (!addrbook_add_contact(abf, folder, stripped_addr, stripped_addr, NULL)) {
- g_warning("contact could not been added\n");
+#ifndef USE_NEW_ADDRBOOK
+ if (!addrbook_add_contact(abf, folder, name, stripped_addr, NULL)) {
+#else
+ if (!addressadd_selection(name, stripped_addr, NULL, NULL)) {
+#endif
+ g_warning("contact could not be added\n");
errors++;
}
+ g_free(name);
} else {
debug_print("address '%s' already found in addressbook '%s', skipping\n",
stripped_addr, action->destination);
}
return (errors == 0);
}
-
default:
break;
}
log_warning(LOG_DEBUG_FILTERING, _("action could not apply\n"));
log_print(LOG_DEBUG_FILTERING,
_("no further processing after action [ %s ]\n"), buf);
- } else
- g_warning("No further processing after rule %s\n", buf);
+ }
+ debug_print("No further processing after rule %s\n", buf);
}
g_free(buf);
if (filtering_is_final_action(action)) {
return FALSE;
}
+
+gboolean filtering_action_list_rename_path(GSList *action_list, const gchar *old_path,
+ const gchar *new_path)
+{
+ gchar *base;
+ gchar *prefix;
+ gchar *suffix;
+ gchar *dest_path;
+ gchar *old_path_with_sep;
+ gint destlen;
+ gint prefixlen;
+ gint oldpathlen;
+ GSList * action_cur;
+ const gchar *separator=G_DIR_SEPARATOR_S;
+ gboolean matched = FALSE;
+#ifdef G_OS_WIN32
+again:
+#endif
+ oldpathlen = strlen(old_path);
+ old_path_with_sep = g_strconcat(old_path,separator,NULL);
+
+ for(action_cur = action_list ; action_cur != NULL ;
+ action_cur = action_cur->next) {
+
+ FilteringAction *action = action_cur->data;
+
+ if (action->type == MATCHACTION_SET_TAG ||
+ action->type == MATCHACTION_UNSET_TAG)
+ continue;
+ if (!action->destination)
+ continue;
+
+ destlen = strlen(action->destination);
+
+ if (destlen > oldpathlen) {
+ prefixlen = destlen - oldpathlen;
+ suffix = action->destination + prefixlen;
+
+ if (!strncmp(old_path, suffix, oldpathlen)) {
+ prefix = g_malloc0(prefixlen + 1);
+ strncpy2(prefix, action->destination, prefixlen);
+
+ base = suffix + oldpathlen;
+ while (*base == G_DIR_SEPARATOR) base++;
+ if (*base == '\0')
+ dest_path = g_strconcat(prefix, separator,
+ new_path, NULL);
+ else
+ dest_path = g_strconcat(prefix,
+ separator,
+ new_path,
+ separator,
+ base, NULL);
+
+ g_free(prefix);
+ g_free(action->destination);
+ action->destination = dest_path;
+ matched = TRUE;
+ } else { /* for non-leaf folders */
+ /* compare with trailing slash */
+ if (!strncmp(old_path_with_sep, action->destination, oldpathlen+1)) {
+
+ suffix = action->destination + oldpathlen + 1;
+ dest_path = g_strconcat(new_path, separator,
+ suffix, NULL);
+ g_free(action->destination);
+ action->destination = dest_path;
+ matched = TRUE;
+ }
+ }
+ } else {
+ /* folder-moving a leaf */
+ if (!strcmp(old_path, action->destination)) {
+ dest_path = g_strdup(new_path);
+ g_free(action->destination);
+ action->destination = dest_path;
+ matched = TRUE;
+ }
+ }
+ }
+
+ g_free(old_path_with_sep);
+#ifdef G_OS_WIN32
+ if (!strcmp(separator, G_DIR_SEPARATOR_S) && !matched) {
+ separator = "/";
+ goto again;
+ }
+#endif
+
+ return matched;
+}
projects / claws.git / blobdiff