/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 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"
gchar last_seen_separator;
guint refcnt;
guint max_set_size;
+ gchar *search_charset;
+ gboolean search_charset_supported;
};
struct _IMAPSession
gboolean busy;
gboolean cancelled;
gboolean sens_update_block;
+ gboolean do_destroy;
};
struct _IMAPNameSpace
static gint imap_add_msgs (Folder *folder,
FolderItem *dest,
GSList *file_list,
- GRelation *relation);
+ GHashTable *relation);
static gint imap_copy_msg (Folder *folder,
FolderItem *dest,
static gint imap_copy_msgs (Folder *folder,
FolderItem *dest,
MsgInfoList *msglist,
- GRelation *relation);
+ 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,
static gint imap_remove_msgs (Folder *folder,
FolderItem *dest,
MsgInfoList *msglist,
- GRelation *relation);
+ GHashTable *relation);
+static gint imap_expunge (Folder *folder,
+ FolderItem *dest);
static gint imap_remove_all_msg (Folder *folder,
FolderItem *item);
static gint imap_do_copy_msgs (Folder *folder,
FolderItem *dest,
MsgInfoList *msglist,
- GRelation *relation);
+ GHashTable *relation);
static void imap_delete_all_cached_messages (FolderItem *item);
static void imap_set_batch (Folder *folder,
static gint imap_cmd_copy (IMAPSession *session,
struct mailimap_set * set,
const gchar *destfolder,
- GRelation *uid_mapping,
struct mailimap_set ** source,
struct mailimap_set ** dest);
static gint imap_cmd_store (IMAPSession *session,
IMAPFlags flags,
GSList *tags,
int do_add);
-static gint imap_cmd_expunge (IMAPSession *session);
+static gint imap_cmd_expunge (IMAPSession *session, gboolean force);
static void imap_path_separator_subst (gchar *str,
gchar separator);
static gint imap_get_flags (Folder *folder,
FolderItem *item,
MsgInfoList *msglist,
- GRelation *msgflags);
+ GHashTable *msgflags);
static gchar *imap_folder_get_path (Folder *folder);
static gchar *imap_item_get_path (Folder *folder,
FolderItem *item);
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;
imap_class.remove_all_msg = imap_remove_all_msg;
imap_class.is_msg_changed = imap_is_msg_changed;
imap_class.change_flags = imap_change_flags;
}
}
-static void imap_disc_session_destroy(IMAPSession *session)
+static gboolean imap_ping(gpointer data)
{
- RemoteFolder *rfolder = REMOTE_FOLDER(IMAP_SESSION(session)->folder);
+ Session *session = (Session *)data;
+ IMAPSession *imap_session = IMAP_SESSION(session);
+ int r;
+
+ if (session->state != SESSION_READY)
+ return FALSE;
+ if (imap_session->busy || !imap_session->authenticated)
+ return TRUE;
- if (!rfolder)
+ lock_session(imap_session);
+ r = imap_cmd_noop(imap_session);
+ unlock_session(imap_session);
+
+ return r == MAILIMAP_NO_ERROR;
+}
+
+static void imap_disc_session_destroy(IMAPSession *session)
+{
+ RemoteFolder *rfolder = NULL;
+
+ if (session == NULL)
return;
- if (!session)
+
+ rfolder = REMOTE_FOLDER(IMAP_SESSION(session)->folder);
+
+ if (rfolder == NULL)
return;
log_warning(LOG_PROTOCOL, _("IMAP4 connection broken\n"));
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
}
+static void imap_safe_destroy(IMAPSession *session)
+{
+ if (!session->busy)
+ session_destroy(SESSION(session));
+ else
+ session->do_destroy = TRUE;
+}
+
static gboolean is_fatal(int libetpan_errcode)
{
switch(libetpan_errcode) {
}
}
-static void imap_handle_error(Session *session, int libetpan_errcode)
+static void imap_handle_error(Session *session, const gchar *server, int libetpan_errcode)
{
- const gchar *session_server = (session ? session->server:"(null)");
+ const gchar *session_server = (session ? session->server : NULL);
+
+ if (session_server == NULL)
+ session_server = server;
+ if (session_server == NULL)
+ session_server = "(null)";
+
switch(libetpan_errcode) {
case MAILIMAP_NO_ERROR:
return;
{
while (imap_folder_get_refcnt(folder) > 0)
gtk_main_iteration();
-
+
+ g_free(IMAP_FOLDER(folder)->search_charset);
+
folder_remote_folder_destroy(REMOTE_FOLDER(folder));
imap_done(folder);
}
{
folder_remote_folder_init((Folder *)folder, name, path);
IMAP_FOLDER(folder)->max_set_size = IMAP_SET_MAX_COUNT;
+ IMAP_FOLDER(folder)->search_charset_supported = TRUE;
+ IMAP_FOLDER(folder)->search_charset = g_strdup(conv_get_locale_charset_str_no_utf8());
}
static FolderItem *imap_folder_item_new(Folder *folder)
return result;
}
- if (capabilities == NULL) {
+ if (capabilities == NULL || capabilities->cap_list == NULL) {
return MAILIMAP_NO_ERROR;
}
int r;
gchar *server = NULL;
if ((r = imap_get_capabilities(session)) != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
return r;
}
server = g_strdup(SESSION(session)->server);
log_warning(LOG_PROTOCOL, _("Connecting to %s failed"),
folder->account->recv_server);
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
session = NULL;
} else {
rfolder->session = NULL;
folder->account->recv_server);
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
/* Clear folders session to make imap_session_get create
a new session, because of rfolder->session == NULL
it will not try to reconnect again and so avoid an
return NULL;
}
+ /* check for deferred destroy */
+ if (rfolder->session != NULL) {
+ session = IMAP_SESSION(rfolder->session);
+ if (!session->busy && session->do_destroy) {
+ rfolder->session = NULL;
+ imap_safe_destroy(session);
+ session = NULL;
+ }
+ }
+
/* Make sure we have a session */
if (rfolder->session != NULL && rfolder->session->state != SESSION_DISCONNECTED) {
session = IMAP_SESSION(rfolder->session);
} else if (rfolder->session != NULL && rfolder->session->state == SESSION_DISCONNECTED) {
- session_destroy(SESSION(rfolder->session));
+ imap_safe_destroy(IMAP_SESSION(rfolder->session));
rfolder->session = NULL;
goto new_conn;
} else if (rfolder->connecting) {
rfolder->session = NULL;
if (!is_fatal(r)) {
imap_threaded_disconnect(session->folder);
- SESSION(session)->state = SESSION_DISCONNECTED;
- SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
}
+ SESSION(session)->state = SESSION_DISCONNECTED;
+ SESSION(session)->sock = NULL;
+ imap_safe_destroy(session);
rfolder->last_failure = time(NULL);
rfolder->connecting = FALSE;
return NULL;
* successfully sent. -- mbp */
if ((time(NULL) - SESSION(session)->last_access_time > SESSION_TIMEOUT_INTERVAL) || session->cancelled) {
/* verify that the session is still alive */
- if ((r = imap_cmd_noop(session)) != MAILIMAP_NO_ERROR) {
+ r = imap_cmd_noop(session);
+
+ if (r != MAILIMAP_NO_ERROR) {
debug_print("disconnected!\n");
if (!is_fatal(r))
session = imap_reconnect_if_possible(folder, session);
else {
rfolder->session = NULL;
rfolder->connecting = FALSE;
+ SESSION(session)->state = SESSION_DISCONNECTED;
+ SESSION(session)->sock = NULL;
+ imap_safe_destroy(session);
session = imap_session_get(folder);
}
}
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,
log_error(LOG_PROTOCOL, _("SSL handshake failed\n"));
else
#endif
- imap_handle_error(NULL, r);
+ imap_handle_error(NULL, account->recv_server, r);
if(!prefs_common.no_recv_err_panel) {
alertpanel_error_log(_("Can't connect to IMAP4 server: %s:%d"),
log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n"));
if (!is_fatal(ok)) {
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
}
return NULL;
}
log_message(LOG_PROTOCOL, "IMAP connection is %s-authenticated\n",
(session->authenticated) ? "pre" : "un");
+ session_register_ping(SESSION(session), imap_ping);
+
return session;
}
gboolean failed = FALSE;
gint ok = MAILIMAP_NO_ERROR;
g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE);
- acc_pass = account->passwd;
+
+ if (password_get(account->userid, account->recv_server, "imap",
+ SESSION(session)->port, &pass)) {
+ Xstrdup_a(acc_pass, pass, {g_free(pass); return MAILIMAP_NO_ERROR;});
+ g_free(pass);
+ } else {
+ acc_pass = account->passwd;
+ }
try_again:
pass = acc_pass;
- if (!pass && account->imap_auth_type != IMAP_AUTH_ANON) {
+ if (!pass && account->imap_auth_type != IMAP_AUTH_ANON && account->imap_auth_type != IMAP_AUTH_GSSAPI) {
gchar *tmp_pass;
tmp_pass = input_dialog_query_password_keep(account->recv_server,
account->userid,
return MAILIMAP_NO_ERROR;
Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return MAILIMAP_NO_ERROR;});
g_free(tmp_pass);
- } else if (account->imap_auth_type == IMAP_AUTH_ANON) {
+ } 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;
}
if (!cached || !MSG_IS_FULLY_CACHED(cached->flags)) {
have_size = get_file_size_with_crs(filename);
if (cached && (cached->size <= have_size || !body)) {
- procmsg_msginfo_free(cached);
ok = file_strip_crs(filename);
if (ok == 0 && cached && cached->size <= have_size) {
/* we have it all and stripped */
- debug_print("...fully cached in fact; setting flag.\n");
+ debug_print("...fully cached in fact (%u/%zd); setting flag.\n",
+ have_size, cached->size);
procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
}
+ procmsg_msginfo_free(cached);
return filename;
} else if (!cached && time(NULL) - get_file_mtime(filename) < 60) {
debug_print("message not cached and file recent, considering file complete\n");
return TRUE;
}
path = folder_item_get_path(item);
- if (!is_dir_exist(path))
+ if (!is_dir_exist(path)) {
+ g_free(path);
return FALSE;
+ }
filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL);
g_free(path);
return TRUE;
}
size = get_file_size_with_crs(filename);
- g_free(filename);
}
+ g_free(filename);
+ debug_print("msg %d cached, has size %d, full should be %zd.\n", uid, size, cached->size);
if (cached && size >= cached->size) {
cached->total_size = cached->size;
procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
}
static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
- GRelation *relation)
+ GHashTable *relation)
{
gchar *destdir;
IMAPSession *session;
return -1;
}
destdir = imap_get_real_path(session, IMAP_FOLDER(folder), dest->path, &ok);
- if (is_fatal(ok))
+ if (is_fatal(ok)) {
+ g_free(destdir);
return -1;
+ }
statusbar_print_all(_("Adding messages..."));
total = g_slist_length(file_list);
for (cur = file_list; cur != NULL; cur = cur->next) {
}
if (relation != NULL)
- g_relation_insert(relation, fileinfo->msginfo != NULL ?
+ g_hash_table_insert(relation, fileinfo->msginfo != NULL ?
(gpointer) fileinfo->msginfo : (gpointer) fileinfo,
GINT_TO_POINTER(new_uid));
if (last_uid < new_uid) {
{
GSList *result = NULL;
clistiter *list;
- int start, end, t;
+ guint32 start, end, t;
GSList *cur;
+ if (!set || !set->set_list)
+ return NULL;
+
for (list = clist_begin(set->set_list); list; list = clist_next(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);
return result;
}
static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
- MsgInfoList *msglist, GRelation *relation)
+ MsgInfoList *msglist, GHashTable *relation)
{
FolderItem *src;
gchar *destdir;
MsgInfo *msginfo;
IMAPSession *session;
gint ok = MAILIMAP_NO_ERROR;
- GRelation *uid_mapping;
+ 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");
destdir = imap_get_real_path(session, IMAP_FOLDER(folder), dest->path, &ok);
- if (is_fatal(ok))
+ if (is_fatal(ok)) {
+ g_free(destdir);
return ok;
+ }
seq_list = imap_get_lep_set_from_msglist(IMAP_FOLDER(folder), msglist);
- uid_mapping = g_relation_new(2);
- g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
+ uid_hash = g_hash_table_new(g_direct_hash, g_direct_equal);
statusbar_print_all(_("Copying messages..."));
for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
src->path, destdir);
lock_session(session); /* unlocked later in the function */
- ok = imap_cmd_copy(session, seq_set, destdir, uid_mapping,
+ ok = imap_cmd_copy(session, seq_set, destdir,
&source, &dest);
if (is_fatal(ok)) {
for (s_cur = s_list, d_cur = d_list;
s_cur && d_cur;
s_cur = s_cur->next, d_cur = d_cur->next) {
- g_relation_insert(uid_mapping, s_cur->data, d_cur->data);
+ g_hash_table_insert(uid_hash, s_cur->data, d_cur->data);
}
} else {
mailimap_set_free(dest);
if (ok != MAILIMAP_NO_ERROR) {
- g_relation_destroy(uid_mapping);
+ g_hash_table_destroy(uid_hash);
imap_lep_set_free(seq_list);
statusbar_pop_all();
return -1;
for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
MsgInfo *msginfo = (MsgInfo *)cur->data;
- GTuples *tuples;
-
- tuples = g_relation_select(uid_mapping,
- GINT_TO_POINTER(msginfo->msgnum),
- 0);
- if (tuples->len > 0) {
- gint num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
- g_relation_insert(relation, msginfo,
+ gpointer hashval;
+
+ hashval = g_hash_table_lookup(uid_hash, GINT_TO_POINTER(msginfo->msgnum));
+
+ if (hashval != NULL) {
+ gint num = GPOINTER_TO_INT(hashval);
+ g_hash_table_insert(relation, msginfo,
GINT_TO_POINTER(num));
if (num > last_num)
last_num = num;
g_free(cache_path);
}
} else
- g_relation_insert(relation, msginfo,
+ g_hash_table_insert(relation, msginfo,
GINT_TO_POINTER(0));
- g_tuples_destroy(tuples);
}
statusbar_pop_all();
- g_relation_destroy(uid_mapping);
+ g_hash_table_destroy(uid_hash);
imap_lep_set_free(seq_list);
g_free(destdir);
}
static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
- MsgInfoList *msglist, GRelation *relation)
+ MsgInfoList *msglist, GHashTable *relation)
{
MsgInfo *msginfo;
gint ret;
return ret;
}
+static gboolean imap_matcher_type_is_local(gint matchertype)
+{
+ 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 TRUE;
+ }
+ return FALSE;
+}
+
+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.
+ */
+ if (imap_matcher_type_is_local(matchertype))
+ 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 void imap_change_search_charset(IMAPFolder *folder)
+{
+ /* If server supports charset in searches, but the last used one failed,
+ * changed to the next preferred charset. If none are still available,
+ * disable charset searches.
+ * Charsets are tried in the following order:
+ * UTF-8, locale's charset, UTF-7.
+ */
+
+ if (folder->search_charset_supported) {
+ if (folder->search_charset && !strcmp(folder->search_charset, conv_get_locale_charset_str_no_utf8()))
+ folder->search_charset = "UTF-8";
+ else if (folder->search_charset && !strcmp(folder->search_charset, "UTF-8"))
+ folder->search_charset = "UTF-7";
+ else {
+ folder->search_charset = NULL;
+ folder->search_charset_supported = FALSE;
+ }
+ }
+}
+
+static MatcherProp *imap_matcher_prop_set_charset(IMAPFolder *folder,
+ MatcherProp *utf8_prop,
+ gchar **charset)
+{
+ /* If the match is going to be done locally, or the criteria is on
+ * tag (special-cased to modified-UTF-7), or the expression searched
+ * is ASCII, don't bother converting.
+ */
+ if (imap_matcher_type_is_local(utf8_prop->criteria)
+ || utf8_prop->criteria == MATCHCRITERIA_TAG
+ || utf8_prop->criteria == MATCHCRITERIA_NOT_TAG
+ || utf8_prop->expr == NULL
+ || is_ascii_str(utf8_prop->expr))
+ return matcherprop_new(utf8_prop->criteria,
+ utf8_prop->header,
+ utf8_prop->matchtype,
+ utf8_prop->expr,
+ utf8_prop->value);
+ else {
+ gchar *conv_expr = NULL;
+
+ /* If the search is server-side and the server doesn't support
+ * searching with the charsets we handle, bail out.
+ */
+ if (folder->search_charset_supported == FALSE)
+ return NULL;
+
+ /* Else, convert. */
+ if (*charset == NULL)
+ *charset = g_strdup(folder->search_charset);
+
+ conv_expr = conv_codeset_strdup(utf8_prop->expr, CS_UTF_8, *charset);
+
+ if (conv_expr == NULL)
+ conv_expr = g_strdup(utf8_prop->expr);
+
+ return matcherprop_new(utf8_prop->criteria,
+ utf8_prop->header,
+ utf8_prop->matchtype,
+ conv_expr,
+ utf8_prop->value);
+ }
+}
+
+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;
+ gchar *charset_to_use = NULL;
+
+ 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;
+ MatcherProp *imap_prop = imap_matcher_prop_set_charset(IMAP_FOLDER(folder), prop, &charset_to_use);
+
+ if (imap_prop == NULL) {
+ /* Couldn't convert matcherprop to IMAP - probably not ascii
+ * and server doesn't support the charsets we do. */
+ return -1;
+ }
+
+ matcherPart = search_make_key(imap_prop, &is_all);
+
+ matcherprop_free(imap_prop);
+
+ 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++;
+ }
+ procmsg_msg_list_free(list);
+
+ *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, charset_to_use, 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);
+
+ if (charset_to_use != NULL)
+ g_free(charset_to_use);
+
+ return result;
+ } else if (charset_to_use != NULL) {
+ /* If search failed and was on an 8-bit string, try the next
+ * available charset to search if there still are some.
+ */
+ g_free(charset_to_use);
+
+ imap_change_search_charset(IMAP_FOLDER(folder));
+ if (IMAP_FOLDER(folder)->search_charset_supported)
+ return search_msgs(folder, container, msgs, on_server, predicate,
+ progress_cb, progress_data);
+ else
+ return -1;
+ } else {
+ return -1;
+ }
+}
+
static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest,
- MsgInfoList *msglist, GRelation *relation)
+ MsgInfoList *msglist, GHashTable *relation)
{
gchar *destdir, *dir;
GSList *numlist = NULL, *cur;
MsgInfo *msginfo;
IMAPSession *session;
gint ok = MAILIMAP_NO_ERROR;
- GRelation *uid_mapping;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
}
destdir = imap_get_real_path(session, IMAP_FOLDER(folder), dest->path, &ok);
- if (is_fatal(ok))
+ if (is_fatal(ok)) {
+ g_free(destdir);
return ok;
+ }
for (cur = msglist; cur; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
if (!MSG_IS_DELETED(msginfo->flags))
}
numlist = g_slist_reverse(numlist);
- uid_mapping = g_relation_new(2);
- g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
-
if (numlist != NULL) {
ok = imap_set_message_flags
(session, IMAP_FOLDER_ITEM(msginfo->folder), numlist, IMAP_FLAG_DELETED, NULL, TRUE);
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't set deleted flags\n"));
+ g_free(destdir);
return ok;
}
} /* else we just need to expunge */
- ok = imap_cmd_expunge(session);
+ ok = imap_cmd_expunge(session, folder->account->imap_use_trash);
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't expunge\n"));
+ g_free(destdir);
return ok;
}
}
g_free(dir);
- g_relation_destroy(uid_mapping);
g_slist_free(numlist);
imap_scan_required(folder, dest);
g_free(destdir);
- if (ok == MAILIMAP_NO_ERROR)
- return 0;
- else
- return -1;
+
+ return 0;
}
static gint imap_remove_msgs(Folder *folder, FolderItem *dest,
- MsgInfoList *msglist, GRelation *relation)
+ MsgInfoList *msglist, GHashTable *relation)
{
MsgInfo *msginfo;
if (folder->account->imap_dir && *folder->account->imap_dir) {
gchar *real_path;
- int r;
+ int r = MAILIMAP_NO_ERROR;
clist * lep_list;
Xstrdup_a(root_folder, folder->account->imap_dir, {return -1;});
strtailchomp(root_folder, '/');
real_path = imap_get_real_path
(session, IMAP_FOLDER(folder), root_folder, &r);
- if (is_fatal(r))
+ if (is_fatal(r)) {
+ g_free(real_path);
return -1;
+ }
debug_print("IMAP root directory: %s\n", real_path);
/* check if root directory exist */
&lep_list);
if (r != MAILIMAP_NO_ERROR)
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
if ((r != MAILIMAP_NO_ERROR) || (clist_count(lep_list) == 0)) {
if (!folder->node) {
gchar separator;
gchar wildcard[3];
clist * lep_list;
- int r;
+ int r = MAILIMAP_NO_ERROR;
g_return_val_if_fail(item != NULL, -1);
g_return_val_if_fail(item->folder != NULL, -1);
wildcard[1] = '%';
wildcard[2] = '\0';
real_path = imap_get_real_path(session, imapfolder, item->path, &r);
- if (is_fatal(r))
+ if (is_fatal(r)) {
+ g_free(real_path);
return r;
+ }
} else {
wildcard[0] = '%';
wildcard[1] = '\0';
r = imap_threaded_list(folder, "", wildcard_path, &lep_list);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
item_list = NULL;
+ g_free(real_path);
return r;
}
else {
GSList *item_list = NULL, *cur;
GList *child_list = NULL, *tmplist = NULL;
GSList *sub_list = NULL;
- int r;
+ int r = MAILIMAP_NO_ERROR;
if (!session)
return NULL;
wildcard[1] = '%';
wildcard[2] = '\0';
real_path = imap_get_real_path(session, IMAP_FOLDER(folder), item->path, &r);
- if (is_fatal(r))
+ if (is_fatal(r)) {
+ g_free(real_path);
return NULL;
+ }
} else {
wildcard[0] = '%';
wildcard[1] = '\0';
r = imap_threaded_list(folder, "", wildcard_path, &lep_list);
if (r) {
+ g_free(real_path);
statusbar_pop_all();
return NULL;
}
imap_get_real_path(session,
IMAP_FOLDER(folder), cur_item->path, &r));
if (is_fatal(r)) {
+ g_free(real_path);
statusbar_pop_all();
return NULL;
}
if (unsubs_only) {
r = imap_threaded_lsub(folder, "", wildcard_path, &lep_list);
if (r) {
+ g_free(real_path);
statusbar_pop_all();
return NULL;
}
gchar *tmp = imap_get_real_path(session,
IMAP_FOLDER(folder), cur_item->path, &r);
if (r) {
+ g_free(real_path);
statusbar_pop_all();
+ g_free(tmp);
return NULL;
}
folder_item_destroy(cur_item);
}
}
+ g_free(real_path);
statusbar_pop_all();
return child_list;
gchar separator;
gchar *new_name;
const gchar *p;
- gint ok;
+ gint ok = MAILIMAP_NO_ERROR;
gboolean no_select = FALSE, no_sub = FALSE;
gboolean exist = FALSE;
strtailchomp(dirpath, '/');
Xstrdup_a(new_name, name, {
g_free(dirpath);
+ g_free(imap_path);
return NULL;});
separator = imap_get_path_separator(session, IMAP_FOLDER(folder), imap_path, &ok);
- if (is_fatal(ok))
+ if (is_fatal(ok)) {
+ g_free(imap_path);
return NULL;
+ }
imap_path_separator_subst(imap_path, separator);
/* remove trailing / for display */
strtailchomp(new_name, '/');
argbuf = g_ptr_array_new();
r = imap_threaded_list(folder, "", imap_path, &lep_list);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
log_warning(LOG_PROTOCOL, _("can't create mailbox: LIST failed\n"));
g_free(imap_path);
g_free(dirpath);
}
mailimap_list_result_free(lep_list);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
}
}
imap_threaded_subscribe(folder, imap_path, TRUE);
}
mailimap_list_result_free(lep_list);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
}
}
gchar *new_cache_dir;
IMAPSession *session;
gchar separator;
- gint ok;
+ gint ok = MAILIMAP_NO_ERROR;
gint exists, recent, unseen;
guint32 uid_validity;
real_oldpath = imap_get_real_path(session, IMAP_FOLDER(folder), item->path, &ok);
if (is_fatal(ok)) {
+ g_free(real_oldpath);
return -1;
}
}
separator = imap_get_path_separator(session, IMAP_FOLDER(folder), item->path, &ok);
- if (is_fatal(ok))
+ if (is_fatal(ok)) {
+ g_free(real_oldpath);
return -1;
+ }
if (strchr(item->path, G_DIR_SEPARATOR)) {
dirpath = g_path_get_dirname(item->path);
newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL);
if (is_dir_exist(old_cache_dir)) {
new_cache_dir = folder_item_get_path(item);
- if (rename(old_cache_dir, new_cache_dir) < 0) {
+ if (g_rename(old_cache_dir, new_cache_dir) < 0) {
FILE_OP_ERROR(old_cache_dir, "rename");
}
g_free(new_cache_dir);
gint imap_subscribe(Folder *folder, FolderItem *item, gchar *rpath, gboolean sub)
{
gchar *path;
- gint r = -1;
+ gint r = MAILIMAP_NO_ERROR;
IMAPSession *session;
debug_print("getting session...\n");
}
if (item && item->path) {
path = imap_get_real_path(session, IMAP_FOLDER(folder), item->path, &r);
- if (!path || is_fatal(r))
+ if (!path)
return -1;
- if (!strcmp(path, "INBOX") && sub == FALSE)
+ if (is_fatal(r)) {
+ g_free(path);
+ return -1;
+ }
+ if (!strcmp(path, "INBOX") && sub == FALSE) {
+ g_free(path);
return -1;
+ }
debug_print("%ssubscribing %s\n", sub?"":"un", path);
r = imap_threaded_subscribe(folder, path, sub);
g_free(path);
static gint imap_remove_folder_real(Folder *folder, FolderItem *item)
{
- gint ok;
+ gint ok = MAILIMAP_NO_ERROR;
IMAPSession *session;
gchar *path;
gchar *cache_dir;
return -1;
}
path = imap_get_real_path(session, IMAP_FOLDER(folder), item->path, &ok);
- if (is_fatal(ok))
+ if (is_fatal(ok)) {
+ g_free(path);
return -1;
-
+ }
imap_threaded_subscribe(folder, path, FALSE);
selected_folder = (session->mbox != NULL) &&
}
ok = imap_cmd_delete(session, path);
if (ok != MAILIMAP_NO_ERROR && !is_fatal(ok)) {
- gchar *tmp = g_strdup_printf("%s%c", path,
+ gchar *tmp = NULL;
+
+ ok = MAILIMAP_NO_ERROR;
+ tmp = g_strdup_printf("%s%c", path,
imap_get_path_separator(session, IMAP_FOLDER(folder), path, &ok));
g_free(path);
path = tmp;
r = imap_threaded_fetch_env(session->folder,
imapset, &env_list);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
if (is_fatal(r)) {
stuff->ok = r;
return NULL;
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;
}
- 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;
got_alien_tags = TRUE;
}
if (!g_slist_find(msginfo->tags, GINT_TO_POINTER(id))) {
- msginfo->tags = g_slist_append(
+ msginfo->tags = g_slist_prepend(
msginfo->tags,
GINT_TO_POINTER(id));
}
g_free(real_tag);
}
- slist_free_strings(tags);
- g_slist_free(tags);
+ if (msginfo->tags)
+ msginfo->tags = g_slist_reverse(msginfo->tags);
+ slist_free_strings_full(tags);
msginfo->folder = item;
if (!newlist)
llast = newlist = g_slist_append(newlist, msginfo);
main_window_reflect_tags_changes(mainwindow_get_mainwindow());
}
- for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
- struct mailimap_set * imapset;
-
- imapset = cur->data;
- mailimap_set_free(imapset);
- }
+ imap_lep_set_free(seq_list);
session_set_access_time(SESSION(session));
stuff->done = TRUE;
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;
IMAPFolder *imap_folder = NULL;
IMAPSession *session = NULL;
gchar result = '/';
- gint ok;
+ gint ok = MAILIMAP_NO_ERROR;
if (!item)
return '/';
folder = item->folder;
-
+
if (!folder)
return '/';
-
+
imap_folder = IMAP_FOLDER(folder);
-
- if (!imap_folder)
- return '/';
-
+
debug_print("getting session...");
session = imap_session_get(FOLDER(folder));
result = imap_get_path_separator(session, imap_folder, item->path, &ok);
r = imap_threaded_list((Folder *)folder, "", subfolder, &lep_list);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
log_warning(LOG_PROTOCOL, _("LIST failed\n"));
*ok = r;
return '\0';
}
- if (clist_count(lep_list) > 0) {
+ if (lep_list != NULL && clist_count(lep_list) > 0) {
clistiter * iter = clist_begin(lep_list);
struct mailimap_mailbox_list * mb;
mb = clist_content(iter);
static gchar imap_get_path_separator(IMAPSession *session, IMAPFolder *folder, const gchar *path, gint *ok)
{
gchar separator = '/';
-
+ *ok = MAILIMAP_NO_ERROR;
if (folder->last_seen_separator == 0) {
folder->last_seen_separator = imap_refresh_path_separator(session, folder, "", ok);
}
static gchar *imap_get_real_path(IMAPSession *session, IMAPFolder *folder, const gchar *path, gint *ok)
{
- gchar *real_path;
+ gchar *real_path = NULL;
gchar separator;
-
+
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(path != NULL, NULL);
+ *ok = MAILIMAP_NO_ERROR;
+
real_path = imap_utf8_to_modified_utf7(path, FALSE);
separator = imap_get_path_separator(session, folder, path, ok);
- imap_path_separator_subst(real_path, separator);
+ if (*ok == MAILIMAP_NO_ERROR)
+ imap_path_separator_subst(real_path, separator);
return real_path;
}
for(cur = seq_list ; cur != NULL ; cur = g_slist_next(cur)) {
struct mailimap_set * imapset = (struct mailimap_set *)cur->data;
- struct mailimap_set_item *set_item = clist_content(
- clist_begin(imapset->set_list));
+ struct mailimap_set_item *set_item = NULL;
+
+ if (imapset->set_list)
+ set_item = clist_content(clist_begin(imapset->set_list));
+ else
+ continue;
+
+ if (set_item == NULL)
+ continue;
statusbar_progress_all(set_item->set_first, total, 1);
gboolean block)
{
gchar *real_path;
- gint ok;
+ gint ok = MAILIMAP_NO_ERROR;
gint exists_, recent_, unseen_;
guint32 uid_validity_;
gint can_create_flags_;
session->expunge = 0;
real_path = imap_get_real_path(session, folder, path, &ok);
- if (is_fatal(ok))
- return ok;
+ if (is_fatal(ok)) {
+ g_free(real_path);
+ return ok;
+ }
g_slist_free(IMAP_FOLDER_ITEM(item)->ok_flags);
IMAP_FOLDER_ITEM(item)->ok_flags = NULL;
ok = imap_cmd_select(session, real_path,
guint32 *uid_next, guint32 *uid_validity,
gint *unseen, gboolean block)
{
- int r;
+ int r = MAILIMAP_NO_ERROR;
clistiter * iter;
struct mailimap_mailbox_data_status * data_status;
int got_values;
guint mask = 0;
real_path = imap_get_real_path(session, folder, path, &r);
- if (is_fatal(r))
+ if (is_fatal(r)) {
+ g_free(real_path);
return r;
-
+ }
if (messages) {
mask |= 1 << 0;
*messages = 0;
r = imap_cmd_close(session);
if (r != MAILIMAP_NO_ERROR) {
debug_print("close err %d\n", r);
+ g_free(real_path);
return r;
}
}
g_free(real_path);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("status err %d\n", r);
return r;
}
- if (data_status->st_info_list == NULL) {
- mailimap_mailbox_data_status_free(data_status);
- debug_print("status->st_info_list == NULL\n");
+ if (data_status == NULL || data_status->st_info_list == NULL) {
+ debug_print("data_status %p\n", data_status);
+ if (data_status) {
+ debug_print("data_status->st_info_list %p\n", data_status->st_info_list);
+ mailimap_mailbox_data_status_free(data_status);
+ }
return MAILIMAP_ERROR_BAD_STATE;
}
got_values = 0;
- for(iter = clist_begin(data_status->st_info_list) ; iter != NULL ;
- iter = clist_next(iter)) {
- struct mailimap_status_info * info;
-
- info = clist_content(iter);
- switch (info->st_att) {
- case MAILIMAP_STATUS_ATT_MESSAGES:
- if (messages) {
- * messages = info->st_value;
- got_values |= 1 << 0;
- }
- break;
-
- case MAILIMAP_STATUS_ATT_UIDNEXT:
- if (uid_next) {
- * uid_next = info->st_value;
- got_values |= 1 << 2;
- }
- break;
-
- case MAILIMAP_STATUS_ATT_UIDVALIDITY:
- if (uid_validity) {
- * uid_validity = info->st_value;
- got_values |= 1 << 3;
- }
- break;
-
- case MAILIMAP_STATUS_ATT_UNSEEN:
- if (unseen) {
- * unseen = info->st_value;
- got_values |= 1 << 4;
+ if (data_status->st_info_list) {
+ for(iter = clist_begin(data_status->st_info_list) ; iter != NULL ;
+ iter = clist_next(iter)) {
+ struct mailimap_status_info * info;
+
+ info = clist_content(iter);
+ switch (info->st_att) {
+ case MAILIMAP_STATUS_ATT_MESSAGES:
+ if (messages) {
+ * messages = info->st_value;
+ got_values |= 1 << 0;
+ }
+ break;
+
+ case MAILIMAP_STATUS_ATT_UIDNEXT:
+ if (uid_next) {
+ * uid_next = info->st_value;
+ got_values |= 1 << 2;
+ }
+ break;
+
+ case MAILIMAP_STATUS_ATT_UIDVALIDITY:
+ if (uid_validity) {
+ * uid_validity = info->st_value;
+ got_values |= 1 << 3;
+ }
+ break;
+
+ case MAILIMAP_STATUS_ATT_UNSEEN:
+ if (unseen) {
+ * unseen = info->st_value;
+ got_values |= 1 << 4;
+ }
+ break;
}
- break;
}
}
mailimap_mailbox_data_status_free(data_status);
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;
}
/* refresh capas */
imap_free_capabilities(session);
if ((r = imap_get_capabilities(session)) != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
log_warning(LOG_PROTOCOL, _("Can't refresh capabilities.\n"));
return r;
}
type);
r = imap_threaded_login(session->folder, user, pass, type);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
log_print(LOG_PROTOCOL, "IMAP4< Error logging in to %s\n",
SESSION(session)->server);
ok = r;
r = imap_threaded_noop(session->folder, &exists, &recent, &expunge, &unseen, &uidnext, &uidval);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("noop err %d\n", r);
return r;
}
- session->folder_content_changed = FALSE;
-
if ((exists && exists != session->exists)
|| (recent && recent != session->recent)
|| (expunge && expunge != session->expunge)
r = imap_threaded_starttls(session->folder,
SESSION(session)->server, SESSION(session)->port);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("starttls err %d\n", r);
return r;
}
r = imap_threaded_select(session->folder, folder,
exists, recent, unseen, uid_validity, can_create_flags, ok_flags);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("select err %d\n", r);
return r;
}
r = imap_threaded_close(session->folder);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("close err %d\n", r);
return r;
}
r = imap_threaded_examine(session->folder, folder,
exists, recent, unseen, uid_validity);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("examine err %d\n", r);
return r;
r = imap_threaded_create(session->folder, folder);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
return r;
}
r = imap_threaded_rename(session->folder, old_folder,
new_folder);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
return r;
}
r = imap_threaded_delete(session->folder, folder);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
return r;
}
uid, 0, filename);
}
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("fetch err %d\n", r);
return GINT_TO_POINTER(r);
}
struct mailimap_flag_list * flag_list;
int r;
- g_return_val_if_fail(file != NULL, MAILIMAP_ERROR_BAD_STATE);
+ cm_return_val_if_fail(file != NULL, MAILIMAP_ERROR_BAD_STATE);
flag_list = imap_flag_to_lep(item, flags, NULL);
lock_session(session);
mailimap_flag_list_free(flag_list);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
debug_print("append err %d\n", r);
return r;
}
}
static gint imap_cmd_copy(IMAPSession *session, struct mailimap_set * set,
- const gchar *destfolder, GRelation *uid_mapping,
+ const gchar *destfolder,
struct mailimap_set **source, struct mailimap_set **dest)
{
int r;
r = imap_threaded_copy(session->folder, set, destfolder, source, dest);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
return r;
}
r = imap_threaded_store(session->folder, set, store_att_flags);
mailimap_store_att_flags_free(store_att_flags);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
return r;
}
return MAILIMAP_NO_ERROR;
}
-static gint imap_cmd_expunge(IMAPSession *session)
+static gint imap_cmd_expunge(IMAPSession *session, gboolean do_expunge)
{
int r;
+ if (!do_expunge)
+ return MAILIMAP_NO_ERROR;
+
if (prefs_common.work_offline &&
!inc_offline_should_override(FALSE,
_("Claws Mail needs network access in order "
r = imap_threaded_expunge(session->folder);
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
return r;
}
return MAILIMAP_NO_ERROR;
}
+gint imap_expunge(Folder *folder, FolderItem *item)
+{
+ IMAPSession *session = imap_session_get(folder);
+ if (session == NULL)
+ return -1;
+
+ return imap_cmd_expunge(session, TRUE);
+}
+
static void imap_path_separator_subst(gchar *str, gchar separator)
{
gchar *p;
gchar *new_itempath;
gint oldpathlen;
IMAPSession *session = imap_session_get(item->folder);
- gint ok;
+ gint ok = MAILIMAP_NO_ERROR;
oldpathlen = strlen(oldpath);
if (strncmp(oldpath, item->path, oldpathlen) != 0) {
g_warning("path doesn't match: %s, %s\n", oldpath, item->path);
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, NULL, &lep_uidlist);
}
if (r == MAILIMAP_NO_ERROR) {
- GSList * fetchuid_list =
- imap_uid_list_from_lep(lep_uidlist);
+ uidlist = imap_uid_list_from_lep(lep_uidlist, NULL);
mailimap_search_result_free(lep_uidlist);
-
- uidlist = g_slist_concat(fetchuid_list, uidlist);
} else {
carray * lep_uidtab;
if (r != -1) { /* inited */
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
if (is_fatal(r))
return -1;
}
r = imap_threaded_fetch_uid(folder, 1,
&lep_uidtab);
if (r == MAILIMAP_NO_ERROR) {
- GSList * fetchuid_list =
- imap_uid_list_from_lep_tab(lep_uidtab);
+ uidlist = imap_uid_list_from_lep_tab(lep_uidtab);
imap_fetch_uid_list_free(lep_uidtab);
- uidlist = g_slist_concat(fetchuid_list, uidlist);
}
}
if (r != MAILIMAP_NO_ERROR) {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
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");
lock_session(session); /* unlocked by get_list_of_uids */
if (FOLDER_ITEM(item)->path)
- statusbar_print_all(_("Scanning folder %s%c%s ..."),
+ statusbar_print_all(_("Scanning folder %s%c%s..."),
FOLDER_ITEM(item)->folder->name,
G_DIR_SEPARATOR,
FOLDER_ITEM(item)->path);
else
- statusbar_print_all(_("Scanning folder %s ..."),
+ 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");
return ok;
}
- if (!session->uidplus) {
- ok = imap_cmd_expunge(session);
- } else {
- gchar *uidstr;
+ ok = imap_cmd_expunge(session, folder->account->imap_use_trash);
- uidstr = g_strdup_printf("%u", uid);
- ok = imap_cmd_expunge(session);
- g_free(uidstr);
- }
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't expunge\n"));
return ok;
Folder *folder;
FolderItem *item;
MsgInfoList *msginfo_list;
- GRelation *msgflags;
+ GHashTable *msgflags;
gboolean full_search;
gboolean done;
} get_flags_data;
Folder *folder = stuff->folder;
FolderItem *fitem = (FolderItem *) stuff->item;
MsgInfoList *msginfo_list = stuff->msginfo_list;
- GRelation *msgflags = stuff->msgflags;
+ GHashTable *msgflags = stuff->msgflags;
GSList *elem;
carray * lep_uidtab;
IMAPSession *session;
imapset = cur->data;
if (reverse_seen) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN,
- full_search ? NULL:imapset, &lep_uidlist);
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN, NULL,
+ NULL, full_search ? NULL:imapset, &lep_uidlist);
}
else {
r = imap_threaded_search(folder,
- IMAP_SEARCH_TYPE_UNSEEN,
- full_search ? NULL:imapset, &lep_uidlist);
+ IMAP_SEARCH_TYPE_UNSEEN, NULL,
+ 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);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
goto bail;
}
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED,
- full_search ? NULL:imapset, &lep_uidlist);
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED, NULL,
+ 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);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
goto bail;
}
if (fitem->opened || fitem->processing_pending || fitem == folder->inbox) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
- full_search ? NULL:imapset, &lep_uidlist);
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED, NULL,
+ 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);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
goto bail;
}
if (flag_ok(IMAP_FOLDER_ITEM(fitem), IMAP_FLAG_FORWARDED)) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FORWARDED,
- full_search ? NULL:imapset, &lep_uidlist);
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FORWARDED, NULL,
+ 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);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
goto bail;
}
}
if (flag_ok(IMAP_FOLDER_ITEM(fitem), IMAP_FLAG_SPAM)) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SPAM,
- full_search ? NULL:imapset, &lep_uidlist);
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SPAM, NULL,
+ 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);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
goto bail;
}
}
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
- full_search ? NULL:imapset, &lep_uidlist);
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED, NULL,
+ 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);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
goto bail;
}
}
imap_flags_hash_from_lep_uid_flags_tab(lep_uidtab, flags_hash, tags_hash);
imap_fetch_uid_flags_list_free(lep_uidtab);
} else {
- imap_handle_error(SESSION(session), r);
+ imap_handle_error(SESSION(session), NULL, r);
goto bail;
}
}
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);
}
}
- g_relation_insert(msgflags, msginfo, GINT_TO_POINTER(flags));
+ g_hash_table_insert(msgflags, msginfo, GINT_TO_POINTER(flags));
}
if (got_alien_tags) {
}
static gint imap_get_flags(Folder *folder, FolderItem *item,
- MsgInfoList *msginfo_list, GRelation *msgflags)
+ MsgInfoList *msginfo_list, GHashTable *msgflags)
{
gint result;
get_flags_data *data = g_new0(get_flags_data, 1);
}
}
- for(cur = clist_begin(imap_flags->mbf_oflags) ; cur != NULL ;
- cur = clist_next(cur)) {
- struct mailimap_mbx_list_oflag * oflag;
-
- oflag = clist_content(cur);
-
- switch (oflag->of_type) {
- case MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS:
- flags |= ETPAN_IMAP_MB_NOINFERIORS;
- break;
+ if (imap_flags->mbf_oflags) {
+ for(cur = clist_begin(imap_flags->mbf_oflags) ; cur != NULL ;
+ cur = clist_next(cur)) {
+ struct mailimap_mbx_list_oflag * oflag;
+
+ oflag = clist_content(cur);
+
+ switch (oflag->of_type) {
+ case MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS:
+ flags |= ETPAN_IMAP_MB_NOINFERIORS;
+ break;
+ }
}
- }
-
+ }
return flags;
}
clistiter * iter;
GSList * item_list = NULL, *llast = NULL;
- for(iter = clist_begin(list) ; iter != NULL ;
- iter = clist_next(iter)) {
- struct mailimap_mailbox_list * mb;
- int flags;
- char delimiter;
- char * name;
- char * dup_name;
- gchar * base;
- gchar * loc_name;
- gchar * loc_path;
- FolderItem *new_item;
-
- mb = clist_content(iter);
+ if (list) {
+ for(iter = clist_begin(list) ; iter != NULL ;
+ iter = clist_next(iter)) {
+ struct mailimap_mailbox_list * mb;
+ int flags;
+ char delimiter;
+ char * name;
+ char * dup_name;
+ gchar * base;
+ gchar * loc_name;
+ gchar * loc_path;
+ FolderItem *new_item;
+
+ mb = clist_content(iter);
+
+ if (mb == NULL)
+ continue;
- if (mb == NULL)
- continue;
+ flags = 0;
+ if (mb->mb_flag != NULL)
+ flags = imap_flags_to_flags(mb->mb_flag);
- flags = 0;
- if (mb->mb_flag != NULL)
- flags = imap_flags_to_flags(mb->mb_flag);
-
- delimiter = mb->mb_delimiter;
- name = mb->mb_name;
-
- dup_name = strdup(name);
- if (delimiter != '\0')
- subst_char(dup_name, delimiter, '/');
-
- base = g_path_get_basename(dup_name);
- if (base[0] == '.') {
- g_free(base);
- free(dup_name);
- continue;
- }
- if (!all && path_cmp(name, real_path) == 0) {
+ delimiter = mb->mb_delimiter;
+ name = mb->mb_name;
+
+ dup_name = strdup(name);
+ if (delimiter != '\0')
+ subst_char(dup_name, delimiter, '/');
+
+ base = g_path_get_basename(dup_name);
+ if (base[0] == '.') {
+ g_free(base);
+ free(dup_name);
+ continue;
+ }
+ if (!all && path_cmp(name, real_path) == 0) {
+ g_free(base);
+ free(dup_name);
+ continue;
+ }
+
+ if (!all && dup_name[strlen(dup_name)-1] == '/') {
+ dup_name[strlen(dup_name)-1] = '\0';
+ }
+
+ loc_name = imap_modified_utf7_to_utf8(base, FALSE);
+ loc_path = imap_modified_utf7_to_utf8(dup_name, FALSE);
+
+ new_item = folder_item_new(FOLDER(folder), loc_name, loc_path);
+ if ((flags & ETPAN_IMAP_MB_NOINFERIORS) != 0)
+ new_item->no_sub = TRUE;
+ if (strcmp(dup_name, "INBOX") != 0 &&
+ ((flags & ETPAN_IMAP_MB_NOSELECT) != 0))
+ new_item->no_select = TRUE;
+
+ if (item_list == NULL)
+ llast = item_list = g_slist_append(item_list, new_item);
+ else {
+ llast = g_slist_append(llast, new_item);
+ llast = llast->next;
+ }
+ debug_print("folder '%s' found.\n", loc_path);
g_free(base);
- free(dup_name);
- continue;
- }
+ g_free(loc_path);
+ g_free(loc_name);
- if (!all && dup_name[strlen(dup_name)-1] == '/') {
- dup_name[strlen(dup_name)-1] = '\0';
- }
-
- loc_name = imap_modified_utf7_to_utf8(base, FALSE);
- loc_path = imap_modified_utf7_to_utf8(dup_name, FALSE);
-
- new_item = folder_item_new(FOLDER(folder), loc_name, loc_path);
- if ((flags & ETPAN_IMAP_MB_NOINFERIORS) != 0)
- new_item->no_sub = TRUE;
- if (strcmp(dup_name, "INBOX") != 0 &&
- ((flags & ETPAN_IMAP_MB_NOSELECT) != 0))
- new_item->no_select = TRUE;
-
- if (item_list == NULL)
- llast = item_list = g_slist_append(item_list, new_item);
- else {
- llast = g_slist_append(llast, new_item);
- llast = llast->next;
+ free(dup_name);
}
- debug_print("folder '%s' found.\n", loc_path);
- g_free(base);
- g_free(loc_path);
- g_free(loc_name);
-
- free(dup_name);
- }
-
+ }
return item_list;
}
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;
- for(iter = clist_begin(list) ; iter != NULL ;
- iter = clist_next(iter)) {
- uint32_t * puid;
-
- puid = clist_content(iter);
- result = g_slist_prepend(result, GINT_TO_POINTER(* puid));
+ if (list) {
+ for(iter = clist_begin(list) ; iter != NULL ;
+ iter = clist_next(iter)) {
+ uint32_t * puid;
+
+ puid = clist_content(iter);
+ result = g_slist_prepend(result, GINT_TO_POINTER(* puid));
+ len++;
+ }
+ result = g_slist_reverse(result);
}
-
- 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;
guint32 uid = 0;
goffset size = 0;
MsgFlags flags = {0, 0};
-
+
if (info->headers == NULL)
return NULL;
MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
}
flags.perm_flags = info->flags;
-
+
uid = info->uid;
size = (goffset) info->size;
msginfo = procheader_parse_str(info->headers, flags, FALSE, FALSE);
-
+
if (msginfo) {
msginfo->msgnum = uid;
msginfo->size = size;
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 =
((IMAPFolder *)folder)->refcnt++;
}
-void imap_disconnect_all(void)
+void imap_disconnect_all(gboolean have_connectivity)
{
GList *list;
gboolean short_timeout;
if (account->protocol == A_IMAP4) {
RemoteFolder *folder = (RemoteFolder *)account->folder;
if (folder && folder->session) {
+ if (imap_is_busy(FOLDER(folder)))
+ imap_threaded_cancel(FOLDER(folder));
+
IMAPSession *session = (IMAPSession *)folder->session;
- imap_threaded_disconnect(FOLDER(folder));
+ if (have_connectivity)
+ imap_threaded_disconnect(FOLDER(folder));
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
- session_destroy(SESSION(session));
+ imap_safe_destroy(session);
folder->session = NULL;
}
}
return &imap_class;
}
-void imap_disconnect_all(void)
+void imap_disconnect_all(gboolean have_connectivity)
{
}
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;
unsigned long ucs4 = 0, bitbuf = 0;
/* initialize hex lookup table */
- char *dst, *res = malloc(2*strlen(src)+1);
+ char *dst, *res;
+
+ if (!src) return NULL;
+
+ res = malloc(2*strlen(src)+1);
dst = res;
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