/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
MsgInfoList *msglist,
GHashTable *relation);
+static gint search_msgs (Folder *folder,
+ FolderItem *container,
+ MsgNumberList **msgs,
+ gboolean *on_server,
+ MatcherList *predicate,
+ SearchProgressNotify progress_cb,
+ gpointer progress_data);
+
static gint imap_remove_msg (Folder *folder,
FolderItem *item,
gint uid);
clist * list, const gchar * real_path, gboolean all);
static GSList * imap_get_lep_set_from_numlist(IMAPFolder *folder, MsgNumberList *numlist);
static GSList * imap_get_lep_set_from_msglist(IMAPFolder *folder, MsgInfoList *msglist);
-static GSList * imap_uid_list_from_lep(clist * list);
+static GSList * imap_uid_list_from_lep(clist * list, gint* length);
static GSList * imap_uid_list_from_lep_tab(carray * list);
static void imap_flags_hash_from_lep_uid_flags_tab(carray * list,
GHashTable * hash,
imap_class.type = F_IMAP;
imap_class.idstr = "imap";
imap_class.uistr = "IMAP4";
+ imap_class.supports_server_search = TRUE;
/* Folder functions */
imap_class.new_folder = imap_folder_new;
imap_class.add_msgs = imap_add_msgs;
imap_class.copy_msg = imap_copy_msg;
imap_class.copy_msgs = imap_copy_msgs;
+ imap_class.search_msgs = search_msgs;
imap_class.remove_msg = imap_remove_msg;
imap_class.remove_msgs = imap_remove_msgs;
imap_class.expunge = imap_expunge;
gushort port;
int r;
int authenticated = FALSE;
-
+ gchar *buf;
+
#ifdef USE_GNUTLS
/* FIXME: IMAP over SSL only... */
SSLType ssl_type;
#endif
imap_init(folder);
- statuswindow_print_all(_("Connecting to IMAP4 server: %s..."), folder->account->recv_server);
+ buf = g_strdup_printf(_("Account '%s': Connecting to IMAP4 server: %s:%d..."),
+ folder->account->account_name, folder->account->recv_server,
+ port);
+ statuswindow_print_all("%s", buf);
+ log_message(LOG_PROTOCOL, "%s\n", buf);
+ g_free(buf);
+
#ifndef G_OS_WIN32
if (account->set_tunnelcmd) {
r = imap_threaded_connect_cmd(folder,
} else if (account->imap_auth_type == IMAP_AUTH_ANON || account->imap_auth_type == IMAP_AUTH_GSSAPI) {
pass = "";
}
- statuswindow_print_all(_("Connecting to IMAP4 server %s...\n"),
- account->recv_server);
if ((ok = imap_auth(session, account->userid, pass, account->imap_auth_type)) != MAILIMAP_NO_ERROR) {
- statusbar_pop_all();
if (!failed && !is_fatal(ok)) {
acc_pass = NULL;
for (cur = tags_set; cur; cur = cur->next) {
gint cur_tag = GPOINTER_TO_INT(cur->data);
const gchar *str = tags_get_tag(cur_tag);
- if (strcmp(str, "$Forwarded") && strcmp(str, "Junk") && strcmp(str, "NonJunk") && strcmp(str, "NotJunk") && strcmp(str, "NoJunk") && strcmp(str, "Junk") )
+ if (IS_NOT_RESERVED_TAG(str))
list_set = g_slist_prepend(list_set, g_strdup(str));
}
if (list_set) {
ok = imap_set_message_flags(session,
IMAP_FOLDER_ITEM(item), &numlist, 0, list_set, TRUE);
- slist_free_strings(list_set);
- g_slist_free(list_set);
+ slist_free_strings_full(list_set);
if (ok != MAILIMAP_NO_ERROR) {
return;
}
for (cur = tags_unset; cur; cur = cur->next) {
gint cur_tag = GPOINTER_TO_INT(cur->data);
const gchar *str = tags_get_tag(cur_tag);
- if (strcmp(str, "$Forwarded") && strcmp(str, "Junk") && strcmp(str, "NonJunk") && strcmp(str, "NotJunk") && strcmp(str, "NoJunk") && strcmp(str, "Junk") )
+ if (IS_NOT_RESERVED_TAG(str))
list_unset = g_slist_prepend(list_unset, g_strdup(str));
}
if (list_unset) {
ok = imap_set_message_flags(session,
IMAP_FOLDER_ITEM(item), &numlist, 0, list_unset, FALSE);
- slist_free_strings(list_unset);
- g_slist_free(list_unset);
+ slist_free_strings_full(list_unset);
if (ok != MAILIMAP_NO_ERROR) {
return;
}
{
GSList *result = NULL;
clistiter *list;
- int start, end, t;
+ guint32 start, end, t;
GSList *cur;
if (!set || !set->set_list)
struct mailimap_set_item *item = (struct mailimap_set_item *)clist_content(list);
start = item->set_first;
end = item->set_last;
- for (t = start; t <= end; t++) {
- result = g_slist_prepend(result, GINT_TO_POINTER(t));
+ if (start <= end) {
+ for (t = start; t <= end; t++) {
+ result = g_slist_prepend(result, GINT_TO_POINTER(t));
+ }
}
}
result = g_slist_reverse(result);
gint ok = MAILIMAP_NO_ERROR;
GHashTable *uid_hash;
gint last_num = 0;
- gboolean single = FALSE;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
}
msginfo = (MsgInfo *)msglist->data;
- if (msglist->next == NULL)
- single = TRUE;
src = msginfo->folder;
if (src == dest) {
g_warning("the src folder is identical to the dest.\n");
}
+static IMAPSearchKey* search_make_key(MatcherProp* match, gboolean* is_all)
+{
+ if (match->matchtype == MATCHTYPE_MATCHCASE || match->matchtype == MATCHTYPE_MATCH) {
+ IMAPSearchKey* result = NULL;
+ gboolean invert = FALSE;
+ gint matchertype = match->criteria;
+
+ if (is_all) {
+ *is_all = FALSE;
+ }
+
+ switch (matchertype) {
+ case MATCHCRITERIA_NOT_NEW: invert = TRUE; matchertype = MATCHCRITERIA_NEW; break;
+ case MATCHCRITERIA_NOT_MARKED: invert = TRUE; matchertype = MATCHCRITERIA_MARKED; break;
+ case MATCHCRITERIA_NOT_FORWARDED: invert = TRUE; matchertype = MATCHCRITERIA_FORWARDED; break;
+ case MATCHCRITERIA_NOT_SPAM: invert = TRUE; matchertype = MATCHCRITERIA_SPAM; break;
+ case MATCHCRITERIA_NOT_SUBJECT: invert = TRUE; matchertype = MATCHCRITERIA_SUBJECT; break;
+ case MATCHCRITERIA_NOT_FROM: invert = TRUE; matchertype = MATCHCRITERIA_FROM; break;
+ case MATCHCRITERIA_NOT_TO: invert = TRUE; matchertype = MATCHCRITERIA_TO; break;
+ case MATCHCRITERIA_NOT_CC: invert = TRUE; matchertype = MATCHCRITERIA_CC; break;
+ case MATCHCRITERIA_NOT_REFERENCES: invert = TRUE; matchertype = MATCHCRITERIA_REFERENCES; break;
+ case MATCHCRITERIA_NOT_HEADER: invert = TRUE; matchertype = MATCHCRITERIA_HEADER; break;
+ case MATCHCRITERIA_NOT_TAG: invert = TRUE; matchertype = MATCHCRITERIA_TAG; break;
+ case MATCHCRITERIA_NOT_HEADERS_PART: invert = TRUE; matchertype = MATCHCRITERIA_HEADERS_PART; break;
+ case MATCHCRITERIA_NOT_MESSAGE: invert = TRUE; matchertype = MATCHCRITERIA_MESSAGE; break;
+ case MATCHCRITERIA_NOT_BODY_PART: invert = TRUE; matchertype = MATCHCRITERIA_BODY_PART; break;
+ case MATCHCRITERIA_NOT_TO_AND_NOT_CC: invert = TRUE; matchertype = MATCHCRITERIA_TO_OR_CC; break;
+ case MATCHCRITERIA_NOT_INREPLYTO: invert = TRUE; matchertype = MATCHCRITERIA_INREPLYTO; break;
+ }
+
+ /*
+ * this aborts conversion even for predicates understood by the following code.
+ * while that might seem wasteful, claws local search for information listed below
+ * has proven faster than IMAP search plus network roundtrips. once this changes,
+ * consider removing these exceptions.
+ */
+ switch (matchertype) {
+ case MATCHCRITERIA_FROM:
+ case MATCHCRITERIA_TO:
+ case MATCHCRITERIA_CC:
+ case MATCHCRITERIA_TO_OR_CC:
+ case MATCHCRITERIA_SUBJECT:
+ case MATCHCRITERIA_REFERENCES:
+ case MATCHCRITERIA_INREPLYTO:
+ case MATCHCRITERIA_AGE_GREATER:
+ case MATCHCRITERIA_AGE_LOWER:
+ case MATCHCRITERIA_FORWARDED:
+ case MATCHCRITERIA_SPAM:
+ case MATCHCRITERIA_UNREAD:
+ case MATCHCRITERIA_NEW:
+ case MATCHCRITERIA_MARKED:
+ case MATCHCRITERIA_REPLIED:
+ case MATCHCRITERIA_DELETED:
+ case MATCHCRITERIA_SIZE_GREATER:
+ case MATCHCRITERIA_SIZE_SMALLER:
+ case MATCHCRITERIA_SIZE_EQUAL:
+ return NULL;
+ }
+
+ /* the Message-ID header is also cached */
+ if (matchertype == MATCHCRITERIA_HEADER && g_strcmp0("Message-ID", match->header) == 0) {
+ return NULL;
+ }
+
+ switch (matchertype) {
+ case MATCHCRITERIA_FORWARDED:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_FORWARDED, 0);
+ break;
+
+ case MATCHCRITERIA_SPAM:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, RTAG_JUNK, 0);
+ break;
+
+ case MATCHCRITERIA_INREPLYTO:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_HEADER, "In-Reply-To", match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_REFERENCES:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_HEADER, "References", match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_TO_OR_CC:
+ result = imap_search_or(
+ imap_search_new(IMAP_SEARCH_CRITERIA_TO, NULL, match->expr, 0),
+ imap_search_new(IMAP_SEARCH_CRITERIA_CC, NULL, match->expr, 0)
+ );
+ break;
+
+ case MATCHCRITERIA_HEADERS_PART:
+ result = imap_search_and(
+ imap_search_not(imap_search_new(IMAP_SEARCH_CRITERIA_BODY, NULL, match->expr, 0)),
+ imap_search_new(IMAP_SEARCH_CRITERIA_MESSAGE, NULL, match->expr, 0)
+ );
+ break;
+
+ case MATCHCRITERIA_SIZE_EQUAL:
+ result = imap_search_and(
+ imap_search_not(imap_search_new(IMAP_SEARCH_CRITERIA_SIZE_SMALLER, NULL, NULL, match->value)),
+ imap_search_not(imap_search_new(IMAP_SEARCH_CRITERIA_SIZE_GREATER, NULL, NULL, match->value))
+ );
+ break;
+
+ case MATCHCRITERIA_NOT_UNREAD:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_READ, NULL, NULL, 0);
+ break;
+
+ case MATCHCRITERIA_UNREAD:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_UNREAD, NULL, NULL, 0);
+ break;
+
+ case MATCHCRITERIA_NEW:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_NEW, NULL, NULL, 0);
+ break;
+
+ case MATCHCRITERIA_MARKED:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_MARKED, NULL, NULL, 0);
+ break;
+
+ case MATCHCRITERIA_DELETED:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_DELETED, NULL, NULL, 0);
+ break;
+
+ case MATCHCRITERIA_REPLIED:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_REPLIED, NULL, NULL, 0);
+ break;
+
+ case MATCHCRITERIA_TAG:
+ {
+ gchar *tmp = imap_utf8_to_modified_utf7(match->expr, TRUE);
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_TAG, NULL, tmp, 0);
+ g_free(tmp);
+ }
+ break;
+
+ case MATCHCRITERIA_SUBJECT:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_SUBJECT, NULL, match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_FROM:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_FROM, NULL, match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_TO:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_TO, NULL, match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_CC:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_CC, NULL, match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_AGE_GREATER:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_AGE_GREATER, NULL, NULL, match->value);
+ break;
+
+ case MATCHCRITERIA_AGE_LOWER:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_AGE_LOWER, NULL, NULL, match->value);
+ break;
+
+ case MATCHCRITERIA_BODY_PART:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_BODY, NULL, match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_MESSAGE:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_MESSAGE, NULL, match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_HEADER:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_HEADER, match->header, match->expr, 0);
+ break;
+
+ case MATCHCRITERIA_SIZE_GREATER:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_SIZE_GREATER, NULL, NULL, match->value);
+ break;
+
+ case MATCHCRITERIA_SIZE_SMALLER:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_SIZE_SMALLER, NULL, NULL, match->value);
+ break;
+
+ default:
+ result = imap_search_new(IMAP_SEARCH_CRITERIA_ALL, NULL, NULL, 0);
+ if (is_all) {
+ *is_all = TRUE;
+ }
+ break;
+ }
+
+ if (invert) {
+ result = imap_search_not(result);
+ if (is_all && *is_all) {
+ *is_all = FALSE;
+ }
+ }
+
+ return result;
+ }
+
+ return NULL;
+}
+
+static gint search_msgs (Folder *folder,
+ FolderItem *container,
+ MsgNumberList **msgs,
+ gboolean *on_server,
+ MatcherList *predicate,
+ SearchProgressNotify progress_cb,
+ gpointer progress_data)
+{
+ IMAPSearchKey* key = NULL;
+ GSList* cur;
+ int result = -1;
+ clist* uidlist = NULL;
+ gboolean server_filtering_useless = FALSE;
+ IMAPSession *session;
+
+ if (on_server == NULL || !*on_server) {
+ return folder_item_search_msgs_local(folder, container, msgs, on_server,
+ predicate, progress_cb, progress_data);
+ }
+
+ for (cur = predicate->matchers; cur != NULL; cur = cur->next) {
+ IMAPSearchKey* matcherPart = NULL;
+ MatcherProp* prop = (MatcherProp*) cur->data;
+ gboolean is_all;
+
+ matcherPart = search_make_key(prop, &is_all);
+
+ if (on_server) {
+ *on_server &= matcherPart != NULL && prop->matchtype == MATCHTYPE_MATCHCASE;
+ }
+
+ if (matcherPart) {
+ if (key == NULL) {
+ key = matcherPart;
+ server_filtering_useless = is_all;
+ } else if (predicate->bool_and) {
+ key = imap_search_and(key, matcherPart);
+ server_filtering_useless &= is_all;
+ } else {
+ key = imap_search_or(key, matcherPart);
+ server_filtering_useless |= is_all;
+ }
+ }
+ }
+
+ if (server_filtering_useless) {
+ imap_search_free(key);
+ key = NULL;
+ }
+
+ if (key == NULL && progress_cb != NULL) {
+ GSList* cur;
+ GSList* list;
+ int count = 0;
+
+ progress_cb(progress_data, TRUE, 0, 0, container->total_msgs);
+ progress_cb(progress_data, TRUE, container->total_msgs, 0, container->total_msgs);
+
+ list = folder_item_get_msg_list(container);
+ for (cur = list; cur != NULL; cur = cur->next) {
+ *msgs = g_slist_prepend(*msgs, GUINT_TO_POINTER(((MsgInfo*) cur->data)->msgnum));
+ count++;
+ }
+ *msgs = g_slist_reverse(*msgs);
+ return count;
+ }
+
+ session = imap_session_get(folder);
+ if (!session) {
+ return -1;
+ }
+ result = imap_select(session, IMAP_FOLDER(folder), FOLDER_ITEM(container),
+ NULL, NULL, NULL, NULL, NULL, TRUE);
+ if (result != MAILIMAP_NO_ERROR)
+ return -1;
+
+ if (progress_cb)
+ progress_cb(progress_data, TRUE, 0, 0, container->total_msgs);
+ result = imap_threaded_search(folder, IMAP_SEARCH_TYPE_KEYED, key, NULL, &uidlist);
+ if (progress_cb)
+ progress_cb(progress_data, TRUE, container->total_msgs, 0, container->total_msgs);
+
+ if (result == MAILIMAP_NO_ERROR) {
+ gint result = 0;
+
+ *msgs = imap_uid_list_from_lep(uidlist, &result);
+ mailimap_search_result_free(uidlist);
+
+ return result;
+ } else {
+ return -1;
+ }
+}
+
+
static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest,
MsgInfoList *msglist, GHashTable *relation)
{
tags = carray_get(env_list, i+1);
msginfo = imap_envelope_from_lep(info, item);
if (msginfo == NULL) {
- slist_free_strings(tags);
- g_slist_free(tags);
+ slist_free_strings_full(tags);
continue;
}
g_slist_free(msginfo->tags);
}
if (msginfo->tags)
msginfo->tags = g_slist_reverse(msginfo->tags);
- slist_free_strings(tags);
- g_slist_free(tags);
+ slist_free_strings_full(tags);
msginfo->folder = item;
if (!newlist)
llast = newlist = g_slist_append(newlist, msginfo);
GSList *result = NULL;
GSList * cur;
uncached_data *data = g_new0(uncached_data, 1);
- int finished;
- finished = 0;
cur = numlist;
data->total = g_slist_length(numlist);
data->ok = MAILIMAP_NO_ERROR;
static void imap_free_capabilities(IMAPSession *session)
{
- slist_free_strings(session->capability);
- g_slist_free(session->capability);
+ slist_free_strings_full(session->capability);
session->capability = NULL;
}
GSList *uidlist, *elem;
int r = -1;
clist * lep_uidlist;
- gint ok, nummsgs = 0, lastuid_old;
+ gint ok, nummsgs = 0;
if (session == NULL) {
return -1;
uidlist = NULL;
if (folder->account && folder->account->low_bandwidth) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SIMPLE, NULL,
- &lep_uidlist);
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SIMPLE,
+ NULL, NULL, &lep_uidlist);
}
if (r == MAILIMAP_NO_ERROR) {
GSList * fetchuid_list =
- imap_uid_list_from_lep(lep_uidlist);
+ imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
uidlist = g_slist_concat(fetchuid_list, uidlist);
return -1;
}
- lastuid_old = item->lastuid;
-
for (elem = uidlist; elem != NULL; elem = g_slist_next(elem)) {
guint msgnum;
gint nummsgs;
GSList *uidlist = NULL;
gchar *dir;
- gboolean selected_folder;
gint known_list_len = 0;
debug_print("get_num_list\n");
statusbar_print_all(_("Scanning folder %s ..."),
FOLDER_ITEM(item)->folder->name);
- selected_folder = (session->mbox != NULL) &&
- (!strcmp(session->mbox, item->item.path));
-
if (item->should_trash_cache) {
*old_uids_valid = FALSE;
debug_print("get_num_list: trashing num list\n");
imapset = cur->data;
if (reverse_seen) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN,
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN, NULL,
full_search ? NULL:imapset, &lep_uidlist);
}
else {
r = imap_threaded_search(folder,
- IMAP_SEARCH_TYPE_UNSEEN,
+ IMAP_SEARCH_TYPE_UNSEEN, NULL,
full_search ? NULL:imapset, &lep_uidlist);
}
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
- uidlist = imap_uid_list_from_lep(lep_uidlist);
+ uidlist = imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
unseen = g_slist_concat(unseen, uidlist);
goto bail;
}
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED,
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED, NULL,
full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
- uidlist = imap_uid_list_from_lep(lep_uidlist);
+ uidlist = imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
flagged = g_slist_concat(flagged, uidlist);
}
if (fitem->opened || fitem->processing_pending || fitem == folder->inbox) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED, NULL,
full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
- uidlist = imap_uid_list_from_lep(lep_uidlist);
+ uidlist = imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
answered = g_slist_concat(answered, uidlist);
}
if (flag_ok(IMAP_FOLDER_ITEM(fitem), IMAP_FLAG_FORWARDED)) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FORWARDED,
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FORWARDED, NULL,
full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
- uidlist = imap_uid_list_from_lep(lep_uidlist);
+ uidlist = imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
forwarded = g_slist_concat(forwarded, uidlist);
}
if (flag_ok(IMAP_FOLDER_ITEM(fitem), IMAP_FLAG_SPAM)) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SPAM,
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SPAM, NULL,
full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
- uidlist = imap_uid_list_from_lep(lep_uidlist);
+ uidlist = imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
spam = g_slist_concat(spam, uidlist);
}
}
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED, NULL,
full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
- uidlist = imap_uid_list_from_lep(lep_uidlist);
+ uidlist = imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
deleted = g_slist_concat(deleted, uidlist);
GSList *tags = g_hash_table_lookup(tags_hash, GINT_TO_POINTER(msginfo->msgnum));
GSList *cur;
- if (tags != NULL) {
- g_slist_free(msginfo->tags);
- msginfo->tags = NULL;
- }
+ g_slist_free(msginfo->tags);
+ msginfo->tags = NULL;
+
for (cur = tags; cur; cur = cur->next) {
gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, TRUE);
gint id = 0;
id = tags_add_tag(real_tag);
got_alien_tags = TRUE;
}
- if (!g_slist_find(msginfo->tags, GINT_TO_POINTER(id))) {
- msginfo->tags = g_slist_append(
+ msginfo->tags = g_slist_append(
msginfo->tags,
GINT_TO_POINTER(id));
- }
g_free(real_tag);
}
- slist_free_strings(tags);
- g_slist_free(tags);
+ slist_free_strings_full(tags);
}
}
static GSList * imap_get_lep_set_from_msglist(IMAPFolder *folder, MsgInfoList *msglist)
{
MsgNumberList *numlist = NULL;
- MsgInfoList *cur;
GSList *seq_list;
- for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
- MsgInfo *msginfo = (MsgInfo *) cur->data;
+ numlist = procmsg_get_number_list_for_msgs(msglist);
- numlist = g_slist_prepend(numlist, GINT_TO_POINTER(msginfo->msgnum));
- }
- numlist = g_slist_reverse(numlist);
seq_list = imap_get_lep_set_from_numlist(folder, numlist);
g_slist_free(numlist);
return seq_list;
}
-static GSList * imap_uid_list_from_lep(clist * list)
+static GSList * imap_uid_list_from_lep(clist * list, gint* length)
{
clistiter * iter;
GSList * result;
+ gint len = 0;
result = NULL;
puid = clist_content(iter);
result = g_slist_prepend(result, GINT_TO_POINTER(* puid));
+ len++;
}
result = g_slist_reverse(result);
- }
+ }
+ if (length)
+ *length = len;
return result;
}
GHashTable * tags_hash)
{
unsigned int i;
- GSList * result;
-
- result = NULL;
for(i = 0 ; i < carray_count(list) ; i += 3) {
uint32_t * puid;
mailimap_flag_new_draft());
if (IMAP_IS_FORWARDED(flags) && flag_ok(item, IMAP_FLAG_FORWARDED))
mailimap_flag_list_add(flag_list,
- mailimap_flag_new_flag_keyword(strdup("$Forwarded")));
+ mailimap_flag_new_flag_keyword(strdup(RTAG_FORWARDED)));
if (IMAP_IS_SPAM(flags) && flag_ok(item, IMAP_FLAG_SPAM))
mailimap_flag_list_add(flag_list,
- mailimap_flag_new_flag_keyword(strdup("Junk")));
+ mailimap_flag_new_flag_keyword(strdup(RTAG_JUNK)));
else if (IMAP_IS_HAM(flags) && flag_ok(item, IMAP_FLAG_HAM))
mailimap_flag_list_add(flag_list,
- mailimap_flag_new_flag_keyword(strdup("NonJunk")));
+ mailimap_flag_new_flag_keyword(strdup(RTAG_NON_JUNK)));
for (; cur; cur = cur->next) {
gchar *enc_str =
unsigned long ucs4, utf16, bitbuf;
unsigned char base64[256];
const char *src;
- char *dst, *res = malloc(2*strlen(mbox)+1);
+ char *dst, *res = g_malloc(2*strlen(mbox)+1);
- bitbuf = 0;
dst = res;
src = mbox;
if(!dst) return NULL;
/* Encode US-ASCII characters as themselves */
if (c < 0x80) {
ucs4 = c;
- utf8total = 1;
} else if (utf8total) {
/* save UTF8 bits into UCS4 */
ucs4 = (ucs4 << 6) | (c & 0x3FUL);
projects / claws.git / blobdiff