/*
- * 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-2020 the Claws Mail Team and Hiroyuki Yamamoto
*
* 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_ALT_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)
} else {
debug_print("%d messages to %s in %s\n", found,
cur_op==IS_COPY ? "copy":(cur_op==IS_DELE ?"delete":"move"),
- last_item?(last_item->name ? last_item->name:"(noname)"):"nowhere");
+ last_item->name ? last_item->name:"(noname)");
}
for (cur = batch; cur; cur = cur->next) {
MsgInfo *info = (MsgInfo *)cur->data;
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_ALT_ADDRBOOK
AddressDataSource *book = NULL;
AddressBookFile *abf = NULL;
ItemFolder *folder = NULL;
- gchar buf[BUFFSIZE];
- Header *header;
+#endif
+ gchar *buf = NULL;
+ Header *header = NULL;
gint errors = 0;
+#ifndef USE_ALT_ADDRBOOK
if (!addressbook_peek_folder_exists(action->destination, &book, &folder)) {
- g_warning("addressbook folder not found '%s'\n", action->destination?action->destination:"(null)");
+ g_warning("addressbook folder not found '%s'", action->destination?action->destination:"(null)");
return FALSE;
}
if (!book) {
- g_warning("addressbook_peek_folder_exists returned NULL book\n");
+ g_warning("addressbook_peek_folder_exists returned NULL book");
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, action->header) < 0)
+ return FALSE;
+
header = procheader_parse_header(buf);
+ g_free(buf);
/* add all addresses that are not already in */
if (header && *header->body && (*header->body != '\0')) {
path = action->destination;
start_address_completion(path);
- address_list = address_list_append(address_list, header->body);
+ address_list = g_slist_append(address_list, header->body);
for (walk = address_list; walk != NULL; walk = walk->next) {
gchar *stripped_addr = g_strdup(walk->data);
extract_address(stripped_addr);
if (complete_matches_found(walk->data) == 0) {
- 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");
+ gchar *name = procheader_get_fromname(walk->data);
+ debug_print("adding '%s <%s>' to addressbook '%s'\n",
+ name, stripped_addr, action->destination);
+#ifndef USE_ALT_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");
errors++;
}
+ g_free(name);
} else {
debug_print("address '%s' already found in addressbook '%s', skipping\n",
stripped_addr, action->destination);
g_slist_free(address_list);
end_address_completion();
} else {
- g_warning("header '%s' not set or empty\n", action->header?action->header:"(null)");
+ g_warning("header '%s' not set or empty", action->header?action->header:"(null)");
}
return (errors == 0);
}
-
default:
break;
}
case MATCHACTION_MOVE:
case MATCHACTION_DELETE:
case MATCHACTION_STOP:
- case MATCHACTION_MARK_AS_SPAM:
return TRUE; /* MsgInfo invalid for message */
default:
return FALSE;
}
}
+gboolean processing_enabled(GSList *filtering_list)
+{
+ GSList *l;
+ for (l = filtering_list; l != NULL; l = g_slist_next(l)) {
+ FilteringProp * filtering = (FilteringProp *) l->data;
+ if (filtering->enabled)
+ return TRUE;
+ }
+ return FALSE;
+}
+
static gboolean filter_msginfo(GSList * filtering_list, MsgInfo * info, PrefsAccount* ac_prefs)
{
GSList *l;
if (prefs_common.enable_filtering_debug) {
gchar *tmp = _("undetermined");
-#ifndef G_OS_WIN32
+
switch (context) {
case FILTERING_INCORPORATION:
tmp = _("incorporation");
debug_filtering_session = FALSE;
break;
}
-#else
- debug_filtering_session = FALSE;
-#endif
+
if (debug_filtering_session) {
gchar *file = procmsg_get_message_file_path(info);
gchar *spc = g_strnfill(LOG_TIME_LEN + 1, ' ');
while (prefs_filtering != NULL) {
FilteringProp * filtering = (FilteringProp *)
prefs_filtering->data;
- filteringprop_free(filtering);
prefs_filtering = g_slist_remove(prefs_filtering, filtering);
+ filteringprop_free(filtering);
}
}
projects / claws.git / blobdiff