/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include "imap_gtk.h"
#include "inc.h"
#include "xml.h"
+#include "alertpanel.h"
#ifdef HAVE_LIBETPAN
#include "inputdialog.h"
#include "log.h"
#include "remotefolder.h"
-#include "alertpanel.h"
-#include "sylpheed.h"
+#include "claws.h"
#include "statusbar.h"
#include "msgcache.h"
#include "imap-thread.h"
/* CLAWS */
gboolean folder_content_changed;
guint exists;
+ guint recent;
+ guint expunge;
+ guint unseen;
+ guint uid_validity;
+ guint uid_next;
+
Folder * folder;
gboolean busy;
+ gboolean cancelled;
+ gboolean sens_update_block;
};
struct _IMAPNameSpace
GSList *uid_list;
gboolean batching;
- time_t use_cache;
- gint c_messages;
- guint32 c_uid_next;
- guint32 c_uid_validity;
- gint c_unseen;
-
GHashTable *flags_set_table;
GHashTable *flags_unset_table;
+ guint32 last_change;
+ guint32 last_sync;
+ gboolean should_update;
+ gboolean should_trash_cache;
};
static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item);
gint uid,
gboolean headers,
gboolean body);
+static void imap_remove_cached_msg (Folder *folder,
+ FolderItem *item,
+ MsgInfo *msginfo);
static gint imap_add_msg (Folder *folder,
FolderItem *dest,
const gchar *file,
IMAPAuthType type);
static gint imap_scan_tree_recursive (IMAPSession *session,
- FolderItem *item);
+ FolderItem *item,
+ gboolean subs_only);
static void imap_create_missing_folders (Folder *folder);
static FolderItem *imap_create_special_folder
gint *unseen,
gboolean block);
-static IMAPNameSpace *imap_find_namespace (IMAPFolder *folder,
+static gchar imap_get_path_separator (IMAPSession *session,
+ IMAPFolder *folder,
const gchar *path);
-static gchar imap_get_path_separator (IMAPFolder *folder,
+static gchar *imap_get_real_path (IMAPSession *session,
+ IMAPFolder *folder,
const gchar *path);
-static gchar *imap_get_real_path (IMAPFolder *folder,
- const gchar *path);
-static void imap_synchronise (FolderItem *item);
+static void imap_synchronise (FolderItem *item, gint days);
+static gboolean imap_is_busy (Folder *folder);
static void imap_free_capabilities (IMAPSession *session);
gint *unseen,
guint32 *uid_validity,
gboolean block);
+static gint imap_cmd_close (IMAPSession *session);
static gint imap_cmd_examine (IMAPSession *session,
const gchar *folder,
gint *exists,
static gint imap_cmd_copy (IMAPSession *session,
struct mailimap_set * set,
const gchar *destfolder,
- GRelation *uid_mapping);
+ GRelation *uid_mapping,
+ struct mailimap_set ** source,
+ struct mailimap_set ** dest);
static gint imap_cmd_store (IMAPSession *session,
struct mailimap_set * set,
IMAPFlags flags,
static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
-/* data types conversion libetpan <-> sylpheed */
+/* data types conversion libetpan <-> claws */
static GSList * imap_list_from_lep(IMAPFolder * folder,
clist * list, const gchar * real_path, gboolean all);
static GSList * imap_get_lep_set_from_numlist(MsgNumberList *numlist);
static GSList * imap_get_lep_set_from_msglist(MsgInfoList *msglist);
static GSList * imap_uid_list_from_lep(clist * list);
static GSList * imap_uid_list_from_lep_tab(carray * list);
+static void imap_flags_hash_from_lep_uid_flags_tab(carray * list,
+ GHashTable * hash);
static MsgInfo *imap_envelope_from_lep(struct imap_fetch_env_info * info,
FolderItem *item);
static void imap_lep_set_free(GSList *seq_list);
imap_class.get_flags = imap_get_flags;
imap_class.set_batch = imap_set_batch;
imap_class.synchronise = imap_synchronise;
+ imap_class.remove_cached_msg = imap_remove_cached_msg;
#ifdef USE_PTREAD
pthread_mutex_init(&imap_mutex, NULL);
#endif
g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, imap_reset_uid_lists_func, NULL);
}
-int imap_get_capabilities(IMAPSession *session)
+static int imap_get_capabilities(IMAPSession *session)
{
struct mailimap_capability_data *capabilities = NULL;
clistiter *cur;
return MAILIMAP_NO_ERROR;
}
-gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
+static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
{
GSList *cur;
for (cur = session->capability; cur; cur = cur->next) {
case IMAP_AUTH_LOGIN:
ok = imap_cmd_login(session, user, pass, "LOGIN");
break;
+ case IMAP_AUTH_GSSAPI:
+ ok = imap_cmd_login(session, user, pass, "GSSAPI");
+ break;
default:
debug_print("capabilities:\n"
"\t ANONYMOUS %d\n"
"\t CRAM-MD5 %d\n"
- "\t LOGIN %d\n",
+ "\t LOGIN %d\n"
+ "\t GSSAPI %d\n",
imap_has_capability(session, "ANONYMOUS"),
imap_has_capability(session, "CRAM-MD5"),
- imap_has_capability(session, "LOGIN"));
+ imap_has_capability(session, "LOGIN"),
+ imap_has_capability(session, "GSSAPI"));
if (imap_has_capability(session, "CRAM-MD5"))
ok = imap_cmd_login(session, user, pass, "CRAM-MD5");
+ if (ok == IMAP_ERROR && imap_has_capability(session, "GSSAPI"))
+ ok = imap_cmd_login(session, user, pass, "GSSAPI");
if (ok == IMAP_ERROR) /* we always try LOGIN before giving up */
ok = imap_cmd_login(session, user, pass, "LOGIN");
}
"login refused.%s"),
SESSION(session)->server, ext_info);
} else {
- log_error(_("Connection to %s failed: "
+ log_error(LOG_PROTOCOL, _("Connection to %s failed: "
"login refused.%s\n"),
SESSION(session)->server, ext_info);
}
connection, if yes we don't try to reconnect */
debug_print("reconnecting\n");
if (rfolder->session == NULL) {
- log_warning(_("Connecting to %s failed"),
+ log_warning(LOG_PROTOCOL, _("Connecting to %s failed"),
folder->account->recv_server);
session_destroy(SESSION(session));
session = NULL;
} else {
- log_warning(_("IMAP4 connection to %s has been"
+ log_warning(LOG_PROTOCOL, _("IMAP4 connection to %s has been"
" disconnected. Reconnecting...\n"),
folder->account->recv_server);
statusbar_print_all(_("IMAP4 connection to %s has been"
it will not try to reconnect again and so avoid an
endless loop */
rfolder->session = NULL;
+ debug_print("getting session...\n");
session = imap_session_get(folder);
rfolder->session = SESSION(session);
statusbar_pop_all();
return session;
}
-#define lock_session() {\
- debug_print("locking session\n"); \
- session->busy = TRUE;\
+static void imap_refresh_sensitivity (IMAPSession *session)
+{
+ MainWindow *mainwin;
+
+ if (session->sens_update_block)
+ return;
+ mainwin = mainwindow_get_mainwindow();
+ if (mainwin) {
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
+ }
+}
+
+static void lock_session(IMAPSession *session)
+{
+ if (session) {
+ debug_print("locking session %p (%d)\n", session, session->busy);
+ if (session->busy)
+ debug_print(" SESSION WAS LOCKED !! \n");
+ session->busy = TRUE;
+ imap_refresh_sensitivity(session);
+ } else {
+ debug_print("can't lock null session\n");
+ }
}
-#define unlock_session() {\
- debug_print("unlocking session\n"); \
- session->busy = FALSE;\
+static void unlock_session(IMAPSession *session)
+{
+ if (session) {
+
+ debug_print("unlocking session %p\n", session);
+ session->busy = FALSE;
+ imap_refresh_sensitivity(session);
+ } else {
+ debug_print("can't unlock null session\n");
+ }
}
static IMAPSession *imap_session_get(Folder *folder)
g_return_val_if_fail(folder->account != NULL, NULL);
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(FALSE,
+ _("Claws Mail needs network access in order "
"to access the IMAP server."))) {
return NULL;
}
/* Make sure we have a session */
if (rfolder->session != NULL) {
session = IMAP_SESSION(rfolder->session);
- /* don't do that yet...
- if (session->busy) {
- return NULL;
- } */
+ } else if (rfolder->connecting) {
+ debug_print("already connecting\n");
+ return NULL;
} else {
imap_reset_uid_lists(folder);
if (time(NULL) - rfolder->last_failure <= 2)
return NULL;
+ rfolder->connecting = TRUE;
session = imap_session_new(folder, folder->account);
}
if(session == NULL) {
rfolder->last_failure = time(NULL);
+ rfolder->connecting = FALSE;
return NULL;
}
session_destroy(SESSION(session));
rfolder->session = NULL;
rfolder->last_failure = time(NULL);
+ rfolder->connecting = FALSE;
return NULL;
}
+ lock_session(session);
+
/* I think the point of this code is to avoid sending a
* keepalive if we've used the session recently and therefore
* think it's still alive. Unfortunately, most of the code
* A better solution than sending a NOOP every time would be
* for every command to be prepared to retry until it is
* successfully sent. -- mbp */
- if (time(NULL) - SESSION(session)->last_access_time > SESSION_TIMEOUT_INTERVAL) {
+ if ((time(NULL) - SESSION(session)->last_access_time > SESSION_TIMEOUT_INTERVAL) || session->cancelled) {
/* verify that the session is still alive */
if (imap_cmd_noop(session) != IMAP_SUCCESS) {
debug_print("disconnected!\n");
session = imap_reconnect_if_possible(folder, session);
}
+ if (session)
+ session->cancelled = FALSE;
}
rfolder->session = SESSION(session);
-
+ rfolder->connecting = FALSE;
+
return IMAP_SESSION(session);
}
if (alertpanel_full(_("Insecure connection"),
_("This connection is configured to be secured "
"using SSL, but SSL is not available in this "
- "build of Sylpheed-Claws. \n\n"
+ "build of Claws Mail. \n\n"
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
authenticated = FALSE;
}
else {
+#if (LIBETPAN_VERSION_MAJOR > 0 || LIBETPAN_VERSION_MINOR > 48)
+#ifdef USE_OPENSSL
+ if (r == MAILIMAP_ERROR_SSL)
+ log_error(LOG_PROTOCOL, _("SSL handshake failed\n"));
+#endif
+#endif
if(!prefs_common.no_recv_err_panel) {
- alertpanel_error(_("Can't connect to IMAP4 server: %s:%d"),
+ alertpanel_error_log(_("Can't connect to IMAP4 server: %s:%d"),
account->recv_server, port);
} else {
- log_error(_("Can't connect to IMAP4 server: %s:%d\n"),
+ log_error(LOG_PROTOCOL, _("Can't connect to IMAP4 server: %s:%d\n"),
account->recv_server, port);
}
session->authenticated = authenticated;
session->mbox = NULL;
+ session->exists = 0;
+ session->recent = 0;
+ session->expunge = 0;
session->cmd_count = 0;
session->folder = folder;
IMAP_FOLDER(session->folder)->last_seen_separator = 0;
ok = imap_cmd_starttls(session);
if (ok != IMAP_SUCCESS) {
- log_warning(_("Can't start TLS session.\n"));
+ log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n"));
session_destroy(SESSION(session));
return NULL;
}
session->cmd_count = 1;
}
#endif
- log_message("IMAP connection is %s-authenticated\n",
+ log_message(LOG_PROTOCOL, "IMAP connection is %s-authenticated\n",
(session->authenticated) ? "pre" : "un");
return session;
failed = TRUE;
goto try_again;
} else {
- alertpanel_error_log(_("Couldn't login to IMAP server %s."), account->recv_server);
+ if (prefs_common.no_recv_err_panel) {
+ log_error(LOG_PROTOCOL, _("Couldn't login to IMAP server %s."), account->recv_server);
+ mainwindow_show_error();
+ } else
+ alertpanel_error_log(_("Couldn't login to IMAP server %s."), account->recv_server);
}
return;
return imap_fetch_msg_full(folder, item, uid, TRUE, TRUE);
}
-static guint get_size_with_crs(MsgInfo *info)
+static guint get_file_size_with_crs(const gchar *filename)
{
FILE *fp = NULL;
guint cnt = 0;
gchar buf[4096];
- if (info == NULL)
+ if (filename == NULL)
return -1;
- fp = procmsg_open_message(info);
+ fp = fopen(filename, "rb");
if (!fp)
return -1;
while (fgets(buf, sizeof (buf), fp) != NULL) {
cnt += strlen(buf);
- if (!strstr(buf, "\r") && strstr(buf, "\n"))
+ if (!strstr(buf, "\r\n") && strstr(buf, "\n"))
cnt++;
}
return cnt;
}
+static void imap_remove_cached_msg(Folder *folder, FolderItem *item, MsgInfo *msginfo)
+{
+ gchar *path, *filename;
+
+ path = folder_item_get_path(item);
+
+ if (!is_dir_exist(path)) {
+ g_free(path);
+ return;
+ }
+
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msginfo->msgnum), NULL);
+ g_free(path);
+
+ if (is_file_exist(filename)) {
+ g_unlink(filename);
+ }
+ g_free(filename);
+}
+
static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
gboolean headers, gboolean body)
{
/* see whether the local file represents the whole message
* or not. As the IMAP server reports size with \r chars,
* we have to update the local file (UNIX \n only) size */
- MsgInfo *msginfo = imap_parse_msg(filename, item);
MsgInfo *cached = msgcache_get_msg(item->cache,uid);
- guint have_size = get_size_with_crs(msginfo);
+ guint have_size = get_file_size_with_crs(filename);
if (cached)
debug_print("message %d has been already %scached (%d/%d).\n", uid,
if (cached && (cached->size <= have_size || !body)) {
procmsg_msginfo_free(cached);
- procmsg_msginfo_free(msginfo);
file_strip_crs(filename);
return filename;
- } else if (!cached) {
- debug_print("message not cached, considering file complete\n");
- procmsg_msginfo_free(msginfo);
+ } else if (!cached && time(NULL) - get_file_mtime(filename) < 60) {
+ debug_print("message not cached and file recent, considering file complete\n");
file_strip_crs(filename);
return filename;
} else {
procmsg_msginfo_free(cached);
- procmsg_msginfo_free(msginfo);
}
}
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
return NULL;
}
- lock_session();
-
debug_print("IMAP fetching messages\n");
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL, FALSE);
if (ok != IMAP_SUCCESS) {
g_warning("can't select mailbox %s\n", item->path);
g_free(filename);
- unlock_session();
+ unlock_session(session);
return NULL;
}
if (ok != IMAP_SUCCESS) {
g_warning("can't fetch message %d\n", uid);
g_free(filename);
- unlock_session();
+ unlock_session(session);
return NULL;
}
- unlock_session();
+ unlock_session(session);
file_strip_crs(filename);
return filename;
}
+static gboolean imap_is_msg_fully_cached(Folder *folder, FolderItem *item, gint uid)
+{
+ gchar *path, *filename;
+ guint size = 0;
+ MsgInfo *cached = msgcache_get_msg(item->cache,uid);
+
+ if (!cached)
+ return FALSE;
+
+ path = folder_item_get_path(item);
+ if (!is_dir_exist(path))
+ return FALSE;
+
+ filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL);
+ g_free(path);
+ if (is_file_exist(filename)) {
+ if (cached && cached->total_size == cached->size) {
+ /* fast path */
+ g_free(filename);
+ return TRUE;
+ }
+ size = get_file_size_with_crs(filename);
+ g_free(filename);
+ }
+ if (cached && size >= cached->size) {
+ cached->total_size = cached->size;
+ procmsg_msginfo_free(cached);
+ return TRUE;
+ }
+ if (cached)
+ procmsg_msginfo_free(cached);
+ return FALSE;
+}
+
+void imap_cache_msg(FolderItem *item, gint msgnum)
+{
+ Folder *folder = NULL;
+
+ if (!item)
+ return;
+ folder = item->folder;
+
+ if (!imap_is_msg_fully_cached(folder, item, msgnum)) {
+ gchar *tmp = imap_fetch_msg_full(folder, item, msgnum, TRUE, TRUE);
+ debug_print("fetched %s\n", tmp);
+ g_free(tmp);
+ }
+}
+
static gint imap_add_msg(Folder *folder, FolderItem *dest,
const gchar *file, MsgFlags *flags)
{
MsgFileInfo *fileinfo;
gint ok;
gint curnum = 0, total = 0;
-
+ gboolean missing_uids = FALSE;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(file_list != NULL, -1);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
return -1;
}
- lock_session();
- destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
+ destdir = imap_get_real_path(session, IMAP_FOLDER(folder), dest->path);
statusbar_print_all(_("Adding messages..."));
total = g_slist_length(file_list);
gchar *real_file = NULL;
fileinfo = (MsgFileInfo *)cur->data;
- statusbar_progress_all(curnum, total, 1);
+ statusbar_progress_all(curnum, total, total < 10 ? 1:10);
curnum++;
if (fileinfo->flags) {
g_warning("can't append message %s\n", real_file);
g_free(real_file);
g_free(destdir);
- unlock_session();
+ unlock_session(session);
statusbar_progress_all(0,0,0);
statusbar_pop_all();
return -1;
debug_print("appended new message as %d\n", new_uid);
/* put the local file in the imapcache, so that we don't
* have to fetch it back later. */
+
+ if (new_uid == 0) {
+ missing_uids = TRUE;
+ debug_print("Missing UID (0)\n");
+ }
if (new_uid > 0) {
gchar *cache_path = folder_item_get_path(dest);
if (!is_dir_exist(cache_path))
cache_path, G_DIR_SEPARATOR_S,
itos(new_uid), NULL);
copy_file(real_file, cache_file, TRUE);
- debug_print("copied to cache: %s\n", cache_file);
+ debug_print("got UID %d, copied to cache: %s\n", new_uid, cache_file);
g_free(cache_file);
}
g_free(cache_path);
if (relation != NULL)
g_relation_insert(relation, fileinfo->msginfo != NULL ?
(gpointer) fileinfo->msginfo : (gpointer) fileinfo,
- GINT_TO_POINTER(dest->last_num + 1));
- if (new_uid == 0) {
- new_uid = dest->last_num+1;
- }
+ GINT_TO_POINTER(new_uid));
if (last_uid < new_uid) {
last_uid = new_uid;
}
g_free(real_file);
}
+
statusbar_progress_all(0,0,0);
statusbar_pop_all();
- imap_cmd_expunge(session);
- unlock_session();
+ unlock_session(session);
g_free(destdir);
+ imap_scan_required(folder, dest);
+
+ if (missing_uids) {
+ gint a;
+ ok = imap_select(session, IMAP_FOLDER(folder), dest->path,
+ &a, NULL, NULL, NULL, FALSE);
+ }
return last_uid;
}
+static GSList *flatten_mailimap_set(struct mailimap_set * set)
+{
+ GSList *result = NULL;
+ clistiter *list;
+ int start, end, t;
+ GSList *cur;
+
+ 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));
+ }
+ }
+ result = g_slist_reverse(result);
+ if (debug_get_mode()) {
+ debug_print("flat imap set: ");
+ for (cur = result; cur; cur = cur->next) {
+ debug_print("%d ", GPOINTER_TO_INT(cur->data));
+ }
+ debug_print("\n");
+ }
+
+ return result;
+}
static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
MsgInfoList *msglist, GRelation *relation)
{
gint ok = IMAP_SUCCESS;
GRelation *uid_mapping;
gint last_num = 0;
+ gboolean single = FALSE;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msglist != NULL, -1);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
return -1;
}
- lock_session();
- msginfo = (MsgInfo *)msglist->data;
+ 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");
- unlock_session();
+ unlock_session(session);
return -1;
}
infolist = g_slist_prepend(infolist, fileinfo);
}
infolist = g_slist_reverse(infolist);
+ unlock_session(session);
res = folder_item_add_msgs(dest, infolist, FALSE);
for (cur = infolist; cur; cur = cur->next) {
MsgFileInfo *info = (MsgFileInfo *)cur->data;
ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
NULL, NULL, NULL, NULL, FALSE);
if (ok != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return ok;
}
- destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
+ destdir = imap_get_real_path(session, IMAP_FOLDER(folder), dest->path);
seq_list = imap_get_lep_set_from_msglist(msglist);
uid_mapping = g_relation_new(2);
g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
statusbar_print_all(_("Copying messages..."));
for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
struct mailimap_set * seq_set;
+ struct mailimap_set * source = NULL;
+ struct mailimap_set * dest = NULL;
seq_set = cur->data;
debug_print("Copying messages from %s to %s ...\n",
src->path, destdir);
- ok = imap_cmd_copy(session, seq_set, destdir, uid_mapping);
+ ok = imap_cmd_copy(session, seq_set, destdir, uid_mapping,
+ &source, &dest);
+
+ if (ok == IMAP_SUCCESS) {
+ if (relation && source && dest) {
+ GSList *s_list = flatten_mailimap_set(source);
+ GSList *d_list = flatten_mailimap_set(dest);
+ GSList *s_cur, *d_cur;
+ if (g_slist_length(s_list) == g_slist_length(d_list)) {
+
+ 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);
+ }
+
+ } else {
+ debug_print("hhhmm, source list length != dest list length.\n");
+ }
+ g_slist_free(s_list);
+ g_slist_free(d_list);
+ }
+ }
+
+
+ if (source)
+ mailimap_set_free(source);
+ if (dest)
+ mailimap_set_free(dest);
+
if (ok != IMAP_SUCCESS) {
g_relation_destroy(uid_mapping);
imap_lep_set_free(seq_list);
- unlock_session();
+ unlock_session(session);
+ statusbar_pop_all();
return -1;
}
}
if (tuples->len > 0) {
gint num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
g_relation_insert(relation, msginfo,
- GPOINTER_TO_INT(num));
+ GINT_TO_POINTER(num));
if (num > last_num)
last_num = num;
+ debug_print("copied message %d as %d\n", msginfo->msgnum, num);
+ /* put the local file in the imapcache, so that we don't
+ * have to fetch it back later. */
+ if (num > 0) {
+ gchar *cache_path = folder_item_get_path(msginfo->folder);
+ gchar *real_file = g_strconcat(
+ cache_path, G_DIR_SEPARATOR_S,
+ itos(msginfo->msgnum), NULL);
+ gchar *cache_file = NULL;
+ g_free(cache_path);
+ cache_path = folder_item_get_path(dest);
+ cache_file = g_strconcat(
+ cache_path, G_DIR_SEPARATOR_S,
+ itos(num), NULL);
+ if (!is_dir_exist(cache_path))
+ make_dir_hier(cache_path);
+ if (is_file_exist(real_file) && is_dir_exist(cache_path)) {
+ copy_file(real_file, cache_file, TRUE);
+ debug_print("copied to cache: %s\n", cache_file);
+ }
+ g_free(real_file);
+ g_free(cache_file);
+ g_free(cache_path);
+ }
} else
g_relation_insert(relation, msginfo,
- GPOINTER_TO_INT(0));
+ GINT_TO_POINTER(0));
g_tuples_destroy(tuples);
}
statusbar_pop_all();
g_slist_free(IMAP_FOLDER_ITEM(dest)->uid_list);
IMAP_FOLDER_ITEM(dest)->uid_list = NULL;
- unlock_session();
+ unlock_session(session);
if (ok == IMAP_SUCCESS)
return last_num;
else
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msglist != NULL, -1);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
return -1;
}
- lock_session();
+
msginfo = (MsgInfo *)msglist->data;
ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
NULL, NULL, NULL, NULL, FALSE);
if (ok != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return ok;
}
- destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
+ destdir = imap_get_real_path(session, IMAP_FOLDER(folder), dest->path);
for (cur = msglist; cur; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
if (!MSG_IS_DELETED(msginfo->flags))
g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
ok = imap_set_message_flags
- (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
- numlist, IMAP_FLAG_DELETED, TRUE);
+ (session, numlist, IMAP_FLAG_DELETED, TRUE);
if (ok != IMAP_SUCCESS) {
- log_warning(_("can't set deleted flags\n"));
- unlock_session();
+ log_warning(LOG_PROTOCOL, _("can't set deleted flags\n"));
+ unlock_session(session);
return ok;
}
ok = imap_cmd_expunge(session);
if (ok != IMAP_SUCCESS) {
- log_warning(_("can't expunge\n"));
- unlock_session();
+ log_warning(LOG_PROTOCOL, _("can't expunge\n"));
+ unlock_session(session);
return ok;
}
g_slist_free(numlist);
g_free(destdir);
- unlock_session();
+ unlock_session(session);
if (ok == IMAP_SUCCESS)
return 0;
else
return 0;
}
-static gint imap_scan_tree(Folder *folder)
+gint imap_scan_tree_real(Folder *folder, gboolean subs_only)
{
FolderItem *item = NULL;
IMAPSession *session;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(folder->account != NULL, -1);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
if (!folder->node) {
return -1;
}
- lock_session();
if (folder->account->imap_dir && *folder->account->imap_dir) {
gchar *real_path;
int r;
clist * lep_list;
- Xstrdup_a(root_folder, folder->account->imap_dir, {unlock_session();return -1;});
+ Xstrdup_a(root_folder, folder->account->imap_dir, {unlock_session(session);return -1;});
extract_quote(root_folder, '"');
subst_char(root_folder,
- imap_get_path_separator(IMAP_FOLDER(folder),
+ imap_get_path_separator(session, IMAP_FOLDER(folder),
root_folder),
'/');
strtailchomp(root_folder, '/');
real_path = imap_get_real_path
- (IMAP_FOLDER(folder), root_folder);
+ (session, IMAP_FOLDER(folder), root_folder);
debug_print("IMAP root directory: %s\n", real_path);
/* check if root directory exist */
item->folder = folder;
folder->node = item->node = g_node_new(item);
}
- unlock_session();
+ unlock_session(session);
return -1;
}
mailimap_list_result_free(lep_list);
-
+
g_free(real_path);
}
if (folder->node)
item = FOLDER_ITEM(folder->node->data);
+
+ if (item && !item->path && root_folder) {
+ item->path = g_strdup(root_folder);
+ }
+
if (!item || ((item->path || root_folder) &&
strcmp2(item->path, root_folder) != 0)) {
folder_tree_destroy(folder);
folder->node = item->node = g_node_new(item);
}
- imap_scan_tree_recursive(session, FOLDER_ITEM(folder->node->data));
+ imap_scan_tree_recursive(session, FOLDER_ITEM(folder->node->data), subs_only);
imap_create_missing_folders(folder);
- unlock_session();
+ unlock_session(session);
return 0;
}
-static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
+static gint imap_scan_tree(Folder *folder)
+{
+ gboolean subs_only = FALSE;
+ if (folder->account) {
+ debug_print(" scanning only subs %d\n", folder->account->imap_subsonly);
+ subs_only = folder->account->imap_subsonly;
+ }
+ return imap_scan_tree_real(folder, subs_only);
+}
+
+static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item, gboolean subs_only)
{
Folder *folder;
IMAPFolder *imapfolder;
folder = item->folder;
imapfolder = IMAP_FOLDER(folder);
- separator = imap_get_path_separator(imapfolder, item->path);
+ separator = imap_get_path_separator(session, imapfolder, item->path);
if (folder->ui_func)
folder->ui_func(folder, item, folder->ui_func_data);
wildcard[0] = separator;
wildcard[1] = '%';
wildcard[2] = '\0';
- real_path = imap_get_real_path(imapfolder, item->path);
+ real_path = imap_get_real_path(session, imapfolder, item->path);
} else {
wildcard[0] = '%';
wildcard[1] = '\0';
Xstrcat_a(wildcard_path, real_path, wildcard,
{g_free(real_path); return IMAP_ERROR;});
lep_list = NULL;
- r = imap_threaded_list(folder, "", wildcard_path, &lep_list);
+
+ if (subs_only)
+ r = imap_threaded_lsub(folder, "", wildcard_path, &lep_list);
+ else
+ r = imap_threaded_list(folder, "", wildcard_path, &lep_list);
+
if (r != MAILIMAP_NO_ERROR) {
item_list = NULL;
}
}
}
if (!new_item) {
- debug_print("folder '%s' not found. removing...\n",
- old_item->path);
- folder_item_remove(old_item);
+ if (old_item && old_item->path && !strcmp(old_item->path, "INBOX")) {
+ debug_print("not removing INBOX\n");
+ } else {
+ debug_print("folder '%s' not found. removing...\n",
+ old_item->path);
+ folder_item_remove(old_item);
+ }
} else {
old_item->no_sub = new_item->no_sub;
old_item->no_select = new_item->no_select;
}
if (new_item->no_sub == FALSE)
- imap_scan_tree_recursive(session, new_item);
+ imap_scan_tree_recursive(session, new_item, subs_only);
}
g_slist_free(item_list);
return IMAP_SUCCESS;
}
+GList *imap_scan_subtree(Folder *folder, FolderItem *item, gboolean unsubs_only, gboolean recursive)
+{
+ IMAPSession *session = imap_session_get(folder);
+ gchar *real_path;
+ gchar *wildcard_path;
+ gchar separator;
+ gchar wildcard[3];
+ clist * lep_list;
+ GSList *item_list = NULL, *cur;
+ GList *child_list = NULL, *tmplist = NULL;
+ GSList *sub_list = NULL;
+ int r;
+
+ if (!session)
+ return NULL;
+
+ separator = imap_get_path_separator(session, IMAP_FOLDER(folder), item->path);
+
+ if (item->path) {
+ wildcard[0] = separator;
+ wildcard[1] = '%';
+ wildcard[2] = '\0';
+ real_path = imap_get_real_path(session, IMAP_FOLDER(folder), item->path);
+ } else {
+ wildcard[0] = '%';
+ wildcard[1] = '\0';
+ real_path = g_strdup("");
+ }
+
+ Xstrcat_a(wildcard_path, real_path, wildcard,
+ {g_free(real_path); return NULL;});
+ lep_list = NULL;
+
+ if (unsubs_only)
+ statusbar_print_all(_("Looking for unsubscribed folders in %s..."),
+ item->path?item->path:item->name);
+ else
+ statusbar_print_all(_("Looking for subfolders of %s..."),
+ item->path?item->path:item->name);
+
+ r = imap_threaded_list(folder, "", wildcard_path, &lep_list);
+ if (r) {
+ statusbar_pop_all();
+ return NULL;
+ }
+ item_list = imap_list_from_lep(IMAP_FOLDER(folder),
+ lep_list, real_path, FALSE);
+ mailimap_list_result_free(lep_list);
+
+ for (cur = item_list; cur != NULL; cur = cur->next) {
+ FolderItem *cur_item = FOLDER_ITEM(cur->data);
+ if (recursive) {
+ tmplist = imap_scan_subtree(folder, cur_item,
+ unsubs_only, recursive);
+ if (tmplist)
+ child_list = g_list_concat(child_list, tmplist);
+ }
+ child_list = g_list_prepend(child_list,
+ imap_get_real_path(session,
+ IMAP_FOLDER(folder), cur_item->path));
+
+ folder_item_destroy(cur_item);
+ }
+ child_list = g_list_reverse(child_list);
+ g_slist_free(item_list);
+
+ if (unsubs_only) {
+ r = imap_threaded_lsub(folder, "", wildcard_path, &lep_list);
+ if (r) {
+ statusbar_pop_all();
+ return NULL;
+ }
+ sub_list = imap_list_from_lep(IMAP_FOLDER(folder),
+ lep_list, real_path, FALSE);
+ mailimap_list_result_free(lep_list);
+
+ for (cur = sub_list; cur != NULL; cur = cur->next) {
+ FolderItem *cur_item = FOLDER_ITEM(cur->data);
+ GList *oldlitem = NULL;
+ gchar *tmp = imap_get_real_path(session,
+ IMAP_FOLDER(folder), cur_item->path);
+ folder_item_destroy(cur_item);
+ oldlitem = g_list_find_custom(
+ child_list, tmp, (GCompareFunc)strcmp2);
+ if (oldlitem) {
+ child_list = g_list_remove_link(child_list, oldlitem);
+ g_free(oldlitem->data);
+ g_list_free(oldlitem);
+ }
+ g_free(tmp);
+ }
+ }
+
+ statusbar_pop_all();
+
+ return child_list;
+}
+
static gint imap_create_tree(Folder *folder)
{
g_return_val_if_fail(folder != NULL, -1);
const gchar *p;
gint ok;
gboolean no_select = FALSE, no_sub = FALSE;
+ gboolean exist = FALSE;
g_return_val_if_fail(folder != NULL, NULL);
g_return_val_if_fail(folder->account != NULL, NULL);
g_return_val_if_fail(parent != NULL, NULL);
g_return_val_if_fail(name != NULL, NULL);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
return NULL;
}
- lock_session();
if (!folder_item_parent(parent) && strcmp(name, "INBOX") == 0) {
dirpath = g_strdup(name);
}else if (parent->path)
else if (folder->account->imap_dir && *folder->account->imap_dir) {
gchar *imap_dir;
- Xstrdup_a(imap_dir, folder->account->imap_dir, {unlock_session();return NULL;});
+ Xstrdup_a(imap_dir, folder->account->imap_dir, {unlock_session(session);return NULL;});
strtailchomp(imap_dir, '/');
dirpath = g_strconcat(imap_dir, "/", name, NULL);
} else
strtailchomp(dirpath, '/');
Xstrdup_a(new_name, name, {
g_free(dirpath);
- unlock_session();
+ unlock_session(session);
return NULL;});
- separator = imap_get_path_separator(IMAP_FOLDER(folder), imap_path);
+ separator = imap_get_path_separator(session, IMAP_FOLDER(folder), imap_path);
imap_path_separator_subst(imap_path, separator);
/* remove trailing / for display */
strtailchomp(new_name, '/');
if (strcmp(dirpath, "INBOX") != 0) {
GPtrArray *argbuf;
- gboolean exist = FALSE;
int r;
clist * lep_list;
argbuf = g_ptr_array_new();
r = imap_threaded_list(folder, "", imap_path, &lep_list);
if (r != MAILIMAP_NO_ERROR) {
- log_warning(_("can't create mailbox: LIST failed\n"));
+ log_warning(LOG_PROTOCOL, _("can't create mailbox: LIST failed\n"));
g_free(imap_path);
g_free(dirpath);
ptr_array_free_strings(argbuf);
g_ptr_array_free(argbuf, TRUE);
- unlock_session();
+ unlock_session(session);
return NULL;
}
if (!exist) {
ok = imap_cmd_create(session, imap_path);
if (ok != IMAP_SUCCESS) {
- log_warning(_("can't create mailbox\n"));
+ log_warning(LOG_PROTOCOL, _("can't create mailbox\n"));
g_free(imap_path);
g_free(dirpath);
- unlock_session();
+ unlock_session(session);
return NULL;
}
r = imap_threaded_list(folder, "", imap_path, &lep_list);
}
mailimap_list_result_free(lep_list);
}
-
}
+ imap_threaded_subscribe(folder, imap_path, TRUE);
} else {
clist *lep_list;
int r;
if (!is_dir_exist(dirpath))
make_dir_hier(dirpath);
g_free(dirpath);
- unlock_session();
+ unlock_session(session);
+
+ if (exist) {
+ /* folder existed, scan it */
+ imap_scan_required(folder, new_item);
+ folder_item_scan_full(new_item, FALSE);
+ }
+
return new_item;
}
g_return_val_if_fail(item->path != NULL, -1);
g_return_val_if_fail(name != NULL, -1);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
return -1;
}
- lock_session();
- if (strchr(name, imap_get_path_separator(IMAP_FOLDER(folder), item->path)) != NULL) {
+ if (strchr(name, imap_get_path_separator(session, IMAP_FOLDER(folder), item->path)) != NULL) {
g_warning(_("New folder name must not contain the namespace "
"path separator"));
- unlock_session();
+ unlock_session(session);
return -1;
}
- real_oldpath = imap_get_real_path(IMAP_FOLDER(folder), item->path);
+ real_oldpath = imap_get_real_path(session, IMAP_FOLDER(folder), item->path);
g_free(session->mbox);
session->mbox = NULL;
+ session->exists = 0;
+ session->recent = 0;
+ session->expunge = 0;
ok = imap_cmd_examine(session, "INBOX",
&exists, &recent, &unseen, &uid_validity, FALSE);
if (ok != IMAP_SUCCESS) {
g_free(real_oldpath);
- unlock_session();
+ unlock_session(session);
return -1;
}
- separator = imap_get_path_separator(IMAP_FOLDER(folder), item->path);
+ separator = imap_get_path_separator(session, IMAP_FOLDER(folder), item->path);
if (strchr(item->path, G_DIR_SEPARATOR)) {
dirpath = g_path_get_dirname(item->path);
newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL);
ok = imap_cmd_rename(session, real_oldpath, real_newpath);
if (ok != IMAP_SUCCESS) {
- log_warning(_("can't rename mailbox: %s to %s\n"),
+ log_warning(LOG_PROTOCOL, _("can't rename mailbox: %s to %s\n"),
real_oldpath, real_newpath);
g_free(real_oldpath);
g_free(newpath);
g_free(real_newpath);
- unlock_session();
+ unlock_session(session);
return -1;
}
-
g_free(item->name);
item->name = g_strdup(name);
g_free(newpath);
g_free(real_oldpath);
g_free(real_newpath);
- unlock_session();
+ unlock_session(session);
return 0;
}
+gint imap_subscribe(Folder *folder, FolderItem *item, gchar *rpath, gboolean sub)
+{
+ gchar *path;
+ gint r = -1;
+ IMAPSession *session;
+ debug_print("getting session...\n");
+
+ session = imap_session_get(folder);
+ if (!session) {
+ return -1;
+ }
+ if (item && item->path) {
+ path = imap_get_real_path(session, IMAP_FOLDER(folder), item->path);
+ if (!path)
+ return -1;
+ if (!strcmp(path, "INBOX") && sub == FALSE)
+ return -1;
+ debug_print("%ssubscribing %s\n", sub?"":"un", path);
+ r = imap_threaded_subscribe(folder, path, sub);
+ g_free(path);
+ } else if (rpath) {
+ r = imap_threaded_subscribe(folder, rpath, sub);
+ } else
+ return -1;
+ return r;
+}
+
static gint imap_remove_folder_real(Folder *folder, FolderItem *item)
{
gint ok;
IMAPSession *session;
gchar *path;
gchar *cache_dir;
+ gboolean selected_folder;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(item != NULL, -1);
g_return_val_if_fail(item->path != NULL, -1);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) {
return -1;
}
- lock_session();
- path = imap_get_real_path(IMAP_FOLDER(folder), item->path);
+ path = imap_get_real_path(session, IMAP_FOLDER(folder), item->path);
+ imap_threaded_subscribe(folder, path, FALSE);
+
+ selected_folder = (session->mbox != NULL) &&
+ (!strcmp(session->mbox, item->path));
+ if (selected_folder) {
+ ok = imap_cmd_close(session);
+ if (ok != MAILIMAP_NO_ERROR) {
+ debug_print("close err %d\n", ok);
+ return IMAP_ERROR;
+ }
+ }
ok = imap_cmd_delete(session, path);
if (ok != IMAP_SUCCESS) {
gchar *tmp = g_strdup_printf("%s%c", path,
- imap_get_path_separator(IMAP_FOLDER(folder), path));
+ imap_get_path_separator(session, IMAP_FOLDER(folder), path));
g_free(path);
path = tmp;
ok = imap_cmd_delete(session, path);
}
if (ok != IMAP_SUCCESS) {
- log_warning(_("can't delete mailbox\n"));
+ log_warning(LOG_PROTOCOL, _("can't delete mailbox\n"));
g_free(path);
- unlock_session();
+ unlock_session(session);
return -1;
}
g_warning("can't remove directory '%s'\n", cache_dir);
g_free(cache_dir);
folder_item_remove(item);
- unlock_session();
+ unlock_session(session);
return 0;
}
carray * env_list;
int count;
+ if (session->cancelled)
+ break;
+
imapset = cur->data;
r = imap_threaded_fetch_env(session->folder,
data->cur += count;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(FALSE,
+ _("Claws Mail needs network access in order "
"to access the IMAP server."))) {
g_free(data);
return NULL;
debug_print("done.\n");
}
-static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,
- const gchar *path)
-{
- IMAPNameSpace *namespace = NULL;
- gchar *tmp_path, *name;
-
- if (!path) path = "";
-
- for (; ns_list != NULL; ns_list = ns_list->next) {
- IMAPNameSpace *tmp_ns = ns_list->data;
-
- Xstrcat_a(tmp_path, path, "/", return namespace);
- Xstrdup_a(name, tmp_ns->name, return namespace);
- if (tmp_ns->separator && tmp_ns->separator != '/') {
- subst_char(tmp_path, tmp_ns->separator, '/');
- subst_char(name, tmp_ns->separator, '/');
- }
- if (strncmp(tmp_path, name, strlen(name)) == 0)
- namespace = tmp_ns;
- }
-
- return namespace;
-}
-
-static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
- const gchar *path)
-{
- IMAPNameSpace *namespace;
-
- g_return_val_if_fail(folder != NULL, NULL);
-
- namespace = imap_find_namespace_from_list(folder->ns_personal, path);
- if (namespace) return namespace;
- namespace = imap_find_namespace_from_list(folder->ns_others, path);
- if (namespace) return namespace;
- namespace = imap_find_namespace_from_list(folder->ns_shared, path);
- if (namespace) return namespace;
-
- return NULL;
-}
-
gchar imap_get_path_separator_for_item(FolderItem *item)
{
Folder *folder = NULL;
IMAPFolder *imap_folder = NULL;
+ IMAPSession *session = NULL;
+ gchar result = '/';
+
if (!item)
return '/';
folder = item->folder;
if (!imap_folder)
return '/';
- return imap_get_path_separator(imap_folder, item->path);
+ debug_print("getting session...");
+ session = imap_session_get(FOLDER(folder));
+ result = imap_get_path_separator(session, imap_folder, item->path);
+ unlock_session(session);
+ return result;
}
-static gchar imap_get_path_separator(IMAPFolder *folder, const gchar *path)
+static gchar imap_refresh_path_separator(IMAPSession *session, IMAPFolder *folder, const gchar *subfolder)
{
- IMAPNameSpace *namespace;
- gchar separator = '/';
- IMAPSession *session = imap_session_get(FOLDER(folder));
+ clist * lep_list;
+ int r;
+ gchar separator = '\0';
+
g_return_val_if_fail(session != NULL, '/');
-
- if (folder->last_seen_separator == 0) {
- clist * lep_list;
- int r = imap_threaded_list((Folder *)folder, "", "", &lep_list);
- if (r != MAILIMAP_NO_ERROR) {
- log_warning(_("LIST failed\n"));
- return '/';
- }
-
- if (clist_count(lep_list) > 0) {
- clistiter * iter = clist_begin(lep_list);
- struct mailimap_mailbox_list * mb;
- mb = clist_content(iter);
-
- folder->last_seen_separator = mb->mb_delimiter;
- debug_print("got separator: %c\n", folder->last_seen_separator);
- }
- mailimap_list_result_free(lep_list);
+ r = imap_threaded_list((Folder *)folder, "", subfolder, &lep_list);
+
+ if (r != MAILIMAP_NO_ERROR) {
+ log_warning(LOG_PROTOCOL, _("LIST failed\n"));
+ return '\0';
}
- if (folder->last_seen_separator != 0) {
+ if (clist_count(lep_list) > 0) {
+ clistiter * iter = clist_begin(lep_list);
+ struct mailimap_mailbox_list * mb;
+ mb = clist_content(iter);
+
+ separator = mb->mb_delimiter;
+ debug_print("got separator: %c\n", folder->last_seen_separator);
+ }
+ mailimap_list_result_free(lep_list);
+ return separator;
+}
+
+static gchar imap_get_path_separator(IMAPSession *session, IMAPFolder *folder, const gchar *path)
+{
+ gchar separator = '/';
+
+ if (folder->last_seen_separator == 0) {
+ folder->last_seen_separator = imap_refresh_path_separator(session, folder, "");
+ }
+
+ if (folder->last_seen_separator == 0) {
+ folder->last_seen_separator = imap_refresh_path_separator(session, folder, "INBOX");
+ }
+
+ if (folder->last_seen_separator != 0) {
debug_print("using separator: %c\n", folder->last_seen_separator);
return folder->last_seen_separator;
}
- namespace = imap_find_namespace(folder, path);
- if (namespace && namespace->separator)
- separator = namespace->separator;
-
return separator;
}
-static gchar *imap_get_real_path(IMAPFolder *folder, const gchar *path)
+static gchar *imap_get_real_path(IMAPSession *session, IMAPFolder *folder, const gchar *path)
{
gchar *real_path;
gchar separator;
g_return_val_if_fail(path != NULL, NULL);
real_path = imap_utf8_to_modified_utf7(path);
- separator = imap_get_path_separator(folder, path);
+ separator = imap_get_path_separator(session, folder, path);
imap_path_separator_subst(real_path, separator);
return real_path;
g_free(session->mbox);
session->mbox = NULL;
+ session->exists = 0;
+ session->recent = 0;
+ session->expunge = 0;
- real_path = imap_get_real_path(folder, path);
+ real_path = imap_get_real_path(session, folder, path);
ok = imap_cmd_select(session, real_path,
exists, recent, unseen, uid_validity, block);
if (ok != IMAP_SUCCESS)
- log_warning(_("can't select folder: %s\n"), real_path);
+ log_warning(LOG_PROTOCOL, _("can't select folder: %s\n"), real_path);
else {
session->mbox = g_strdup(path);
session->folder_content_changed = FALSE;
+ session->exists = *exists;
+ session->recent = *recent;
+ session->expunge = 0;
+ session->unseen = *unseen;
+ session->uid_validity = *uid_validity;
+ debug_print("select: exists %d recent %d expunge %d uid_validity %d\n",
+ session->exists, session->recent, session->expunge,
+ session->uid_validity);
}
g_free(real_path);
gchar *real_path;
guint mask = 0;
- real_path = imap_get_real_path(folder, path);
+ real_path = imap_get_real_path(session, folder, path);
if (messages) {
mask |= 1 << 0;
+ *messages = 0;
}
if (uid_next) {
mask |= 1 << 2;
+ *uid_next = 0;
}
if (uid_validity) {
mask |= 1 << 3;
+ *uid_validity = 0;
}
if (unseen) {
mask |= 1 << 4;
+ *unseen = 0;
+ }
+
+ if (session->mbox != NULL &&
+ !strcmp(session->mbox, item->item.path)) {
+ r = imap_cmd_close(session);
+ if (r != MAILIMAP_NO_ERROR) {
+ debug_print("close err %d\n", r);
+ return IMAP_ERROR;
+ }
}
+
r = imap_threaded_status(FOLDER(folder), real_path,
&data_status, mask);
info = clist_content(iter);
switch (info->st_att) {
case MAILIMAP_STATUS_ATT_MESSAGES:
- * messages = info->st_value;
- got_values |= 1 << 0;
+ if (messages) {
+ * messages = info->st_value;
+ got_values |= 1 << 0;
+ }
break;
case MAILIMAP_STATUS_ATT_UIDNEXT:
- * uid_next = info->st_value;
- got_values |= 1 << 2;
+ if (uid_next) {
+ * uid_next = info->st_value;
+ got_values |= 1 << 2;
+ }
break;
case MAILIMAP_STATUS_ATT_UIDVALIDITY:
- * uid_validity = info->st_value;
- got_values |= 1 << 3;
+ if (uid_validity) {
+ * uid_validity = info->st_value;
+ got_values |= 1 << 3;
+ }
break;
case MAILIMAP_STATUS_ATT_UNSEEN:
- * unseen = info->st_value;
- got_values |= 1 << 4;
+ if (unseen) {
+ * unseen = info->st_value;
+ got_values |= 1 << 4;
+ }
break;
}
}
mailimap_mailbox_data_status_free(data_status);
if (got_values != mask) {
- debug_print("status: incomplete values received (%d)\n", got_values);
- return IMAP_ERROR;
+ g_warning("status: incomplete values received (%d)\n", got_values);
}
return IMAP_SUCCESS;
}
gint ok = IMAP_ERROR;
if (imap_has_capability(session, "STARTTLS")) {
#if USE_OPENSSL
- log_warning(_("Server requires TLS to log in.\n"));
+ log_warning(LOG_PROTOCOL, _("Server requires TLS to log in.\n"));
ok = imap_cmd_starttls(session);
if (ok != IMAP_SUCCESS) {
- log_warning(_("Can't start TLS session.\n"));
+ log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n"));
return IMAP_ERROR;
} else {
/* refresh capas */
imap_free_capabilities(session);
if (imap_get_capabilities(session) != MAILIMAP_NO_ERROR) {
- log_warning(_("Can't refresh capabilities.\n"));
+ log_warning(LOG_PROTOCOL, _("Can't refresh capabilities.\n"));
return IMAP_ERROR;
}
}
#else
- log_error(_("Connection to %s failed: "
- "server requires TLS, but Sylpheed-Claws "
+ log_error(LOG_PROTOCOL, _("Connection to %s failed: "
+ "server requires TLS, but Claws Mail "
"has been compiled without OpenSSL "
"support.\n"),
SESSION(session)->server);
return IMAP_ERROR;
#endif
} else {
- log_error(_("Server logins are disabled.\n"));
+ log_error(LOG_PROTOCOL, _("Server logins are disabled.\n"));
return IMAP_ERROR;
}
}
- log_print("IMAP4> Logging %s to %s using %s\n",
+ log_print(LOG_PROTOCOL, "IMAP4> Logging %s to %s using %s\n",
user,
SESSION(session)->server,
type);
r = imap_threaded_login(session->folder, user, pass, type);
if (r != MAILIMAP_NO_ERROR) {
- log_print("IMAP4< Error logging in to %s\n",
+ log_print(LOG_PROTOCOL, "IMAP4< Error logging in to %s\n",
SESSION(session)->server);
ok = IMAP_ERROR;
} else {
- log_print("IMAP4< Login to %s successful\n",
+ log_print(LOG_PROTOCOL, "IMAP4< Login to %s successful\n",
SESSION(session)->server);
ok = IMAP_SUCCESS;
}
static gint imap_cmd_noop(IMAPSession *session)
{
int r;
- unsigned int exists;
+ unsigned int exists, recent, expunge, unseen, uidnext, uidval;
- r = imap_threaded_noop(session->folder, &exists);
+ r = imap_threaded_noop(session->folder, &exists, &recent, &expunge, &unseen, &uidnext, &uidval);
if (r != MAILIMAP_NO_ERROR) {
debug_print("noop err %d\n", r);
return IMAP_ERROR;
}
+
+ session->folder_content_changed = FALSE;
+
+ if ((exists && exists != session->exists)
+ || (recent && recent != session->recent)
+ || (expunge && expunge != session->expunge)
+ || (unseen && unseen != session->unseen)) {
+ session->folder_content_changed = TRUE;
+ }
+ if (uidnext != 0 && uidnext != session->uid_next) {
+ session->uid_next = uidnext;
+ session->folder_content_changed = TRUE;
+ }
+ if (uidval != 0 && uidval != session->uid_validity) {
+ session->uid_validity = uidval;
+ session->folder_content_changed = TRUE;
+ }
+
session->exists = exists;
+ session->recent = recent;
+ session->expunge = expunge;
+ session->unseen = unseen;
+
session_set_access_time(SESSION(session));
return IMAP_SUCCESS;
return IMAP_SUCCESS;
}
+static gint imap_cmd_close(IMAPSession *session)
+{
+ int r;
+
+ r = imap_threaded_close(session->folder);
+ if (r != MAILIMAP_NO_ERROR) {
+ debug_print("close err %d\n", r);
+ return IMAP_ERROR;
+ }
+ g_free(session->mbox);
+ session->mbox = NULL;
+ session->exists = 0;
+ session->recent = 0;
+ session->expunge = 0;
+ return IMAP_SUCCESS;
+}
+
static gint imap_cmd_examine(IMAPSession *session, const gchar *folder,
gint *exists, gint *recent, gint *unseen,
guint32 *uid_validity, gboolean block)
data->body = body;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(FALSE,
+ _("Claws Mail needs network access in order "
"to access the IMAP server."))) {
g_free(data);
return -1;
}
static gint imap_cmd_copy(IMAPSession *session, struct mailimap_set * set,
- const gchar *destfolder, GRelation *uid_mapping)
+ const gchar *destfolder, GRelation *uid_mapping,
+ struct mailimap_set **source, struct mailimap_set **dest)
{
int r;
g_return_val_if_fail(set != NULL, IMAP_ERROR);
g_return_val_if_fail(destfolder != NULL, IMAP_ERROR);
- r = imap_threaded_copy(session->folder, set, destfolder);
+ r = imap_threaded_copy(session->folder, set, destfolder, source, dest);
if (r != MAILIMAP_NO_ERROR) {
return IMAP_ERROR;
int r;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(FALSE,
+ _("Claws Mail needs network access in order "
"to access the IMAP server."))) {
return -1;
}
gchar **paths = data;
const gchar *oldpath = paths[0];
const gchar *newpath = paths[1];
+ gchar *real_oldpath, *real_newpath;
gchar *base;
gchar *new_itempath;
gint oldpathlen;
+ IMAPSession *session = imap_session_get(item->folder);
oldpathlen = strlen(oldpath);
if (strncmp(oldpath, item->path, oldpathlen) != 0) {
else
new_itempath = g_strconcat(newpath, G_DIR_SEPARATOR_S, base,
NULL);
+
+ real_oldpath = imap_get_real_path(session, IMAP_FOLDER(item->folder), item->path);
g_free(item->path);
item->path = new_itempath;
+
+ real_newpath = imap_get_real_path(session, IMAP_FOLDER(item->folder), item->path);
+
+ imap_threaded_subscribe(item->folder, real_oldpath, FALSE);
+ imap_threaded_subscribe(item->folder, real_newpath, TRUE);
+ g_free(real_oldpath);
+ g_free(real_newpath);
return FALSE;
}
gint ok, nummsgs = 0, lastuid_old;
IMAPSession *session;
GSList *uidlist, *elem;
- struct mailimap_set * set;
+ int r = -1;
clist * lep_uidlist;
- int r;
session = stuff->session;
if (session == NULL) {
return GINT_TO_POINTER(-1);
}
+ g_slist_free(item->uid_list);
+ item->uid_list = NULL;
+
uidlist = NULL;
- set = mailimap_set_new_interval(item->lastuid + 1, 0);
-
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SIMPLE, set,
+ if (folder->account && folder->account->low_bandwidth) {
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SIMPLE, NULL,
&lep_uidlist);
- mailimap_set_free(set);
+ }
if (r == MAILIMAP_NO_ERROR) {
- GSList * fetchuid_list;
-
- fetchuid_list =
+ GSList * fetchuid_list =
imap_uid_list_from_lep(lep_uidlist);
mailimap_search_result_free(lep_uidlist);
uidlist = g_slist_concat(fetchuid_list, uidlist);
- }
- else {
- GSList * fetchuid_list;
+ } else {
carray * lep_uidtab;
-
- r = imap_threaded_fetch_uid(folder, item->lastuid + 1,
- &lep_uidtab);
+ r = imap_threaded_fetch_uid(folder, 1,
+ &lep_uidtab);
if (r == MAILIMAP_NO_ERROR) {
- fetchuid_list =
+ GSList * fetchuid_list =
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) {
+ stuff->done = TRUE;
+ return GINT_TO_POINTER(-1);
+ }
+
lastuid_old = item->lastuid;
- *msgnum_list = g_slist_copy(item->uid_list);
- nummsgs = g_slist_length(*msgnum_list);
- debug_print("Got %d uids from cache\n", g_slist_length(item->uid_list));
for (elem = uidlist; elem != NULL; elem = g_slist_next(elem)) {
guint msgnum;
msgnum = GPOINTER_TO_INT(elem->data);
- if (msgnum > lastuid_old) {
- *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(msgnum));
- item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
- nummsgs++;
- if(msgnum > item->lastuid)
- item->lastuid = msgnum;
- }
+ *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(msgnum));
+ item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
+ nummsgs++;
}
g_slist_free(uidlist);
stuff->done = TRUE;
data->msgnum_list = msgnum_list;
data->session = session;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(FALSE,
+ _("Claws Mail needs network access in order "
"to access the IMAP server."))) {
g_free(data);
return -1;
{
IMAPFolderItem *item = (IMAPFolderItem *)_item;
IMAPSession *session;
- gint ok, nummsgs = 0, exists;
- guint32 uid_next = 0, uid_val = 0;
+ gint nummsgs;
GSList *uidlist = NULL;
gchar *dir;
gboolean selected_folder;
+ gint known_list_len = 0;
debug_print("get_num_list\n");
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
g_return_val_if_fail(folder->account != NULL, -1);
+ known_list_len = g_slist_length(item->uid_list);
+ if (!item->should_update) {
+ debug_print("get_num_list: nothing to update\n");
+ *old_uids_valid = TRUE;
+ if (known_list_len == item->item.total_msgs) {
+ *msgnum_list = g_slist_copy(item->uid_list);
+ return known_list_len;
+ } else {
+ debug_print("don't know the list length...\n");
+ }
+ }
+
+ debug_print("getting session...\n");
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, -1);
- lock_session();
if (FOLDER_ITEM(item)->path)
statusbar_print_all(_("Scanning folder %s%c%s ..."),
selected_folder = (session->mbox != NULL) &&
(!strcmp(session->mbox, item->item.path));
- if (selected_folder && time(NULL) - item->use_cache < 2) {
- ok = imap_cmd_noop(session);
- if (ok != IMAP_SUCCESS) {
- debug_print("disconnected!\n");
- session = imap_reconnect_if_possible(folder, session);
- if (session == NULL) {
- statusbar_pop_all();
- unlock_session();
- return -1;
- }
- }
- exists = session->exists;
+
+ if (item->should_trash_cache) {
+ *old_uids_valid = FALSE;
+ debug_print("get_num_list: trashing num list\n");
+ debug_print("Freeing imap uid cache\n");
+ item->lastuid = 0;
+ g_slist_free(item->uid_list);
+ item->uid_list = NULL;
- uid_next = item->c_uid_next;
- uid_val = item->c_uid_validity;
- *old_uids_valid = TRUE;
+ imap_delete_all_cached_messages((FolderItem *)item);
} else {
- if (item->use_cache && time(NULL) - item->use_cache < 2) {
- exists = item->c_messages;
- uid_next = item->c_uid_next;
- uid_val = item->c_uid_validity;
- ok = IMAP_SUCCESS;
- debug_print("using cache %d %d %d\n", exists, uid_next, uid_val);
- } else {
- ok = imap_status(session, IMAP_FOLDER(folder), item->item.path, item,
- &exists, &uid_next, &uid_val, NULL, FALSE);
- }
- item->item.last_num = uid_next - 1;
-
- item->use_cache = (time_t)0;
- if (ok != IMAP_SUCCESS) {
- statusbar_pop_all();
- unlock_session();
- return -1;
- }
- if(item->item.mtime == uid_val)
- *old_uids_valid = TRUE;
- else {
- *old_uids_valid = FALSE;
-
- debug_print("Freeing imap uid cache (%d != %d)\n",
- (int)item->item.mtime, uid_val);
- item->lastuid = 0;
- g_slist_free(item->uid_list);
- item->uid_list = NULL;
-
- item->item.mtime = uid_val;
-
- imap_delete_all_cached_messages((FolderItem *)item);
- }
- }
-
- /* If old uid_next matches new uid_next we can be sure no message
- was added to the folder */
- debug_print("uid_next is %d and item->uid_next %d \n",
- uid_next, item->uid_next);
- if (uid_next == item->uid_next) {
- nummsgs = g_slist_length(item->uid_list);
-
- /* If number of messages is still the same we
- know our caches message numbers are still valid,
- otherwise if the number of messages has decrease
- we discard our cache to start a new scan to find
- out which numbers have been removed */
- if (exists == nummsgs) {
- debug_print("exists == nummsgs\n");
- *msgnum_list = g_slist_copy(item->uid_list);
- statusbar_pop_all();
- unlock_session();
- return nummsgs;
- } else if (exists < nummsgs) {
- debug_print("Freeing imap uid cache");
- item->lastuid = 0;
- g_slist_free(item->uid_list);
- item->uid_list = NULL;
- }
- }
-
- if (exists == 0) {
- *msgnum_list = NULL;
- statusbar_pop_all();
- unlock_session();
- return 0;
+ debug_print("get_num_list: updating num list\n");
+ *old_uids_valid = TRUE;
}
nummsgs = get_list_of_uids(session, folder, item, &uidlist);
+ debug_print("get_num_list: got %d msgs\n", nummsgs);
if (nummsgs < 0) {
statusbar_pop_all();
- unlock_session();
+ unlock_session(session);
return -1;
}
- if (nummsgs != exists) {
- /* Cache contains more messages then folder, we have cached
- an old UID of a message that was removed and new messages
- have been added too, otherwise the uid_next check would
- not have failed */
- debug_print("Freeing imap uid cache");
- item->lastuid = 0;
- g_slist_free(item->uid_list);
- item->uid_list = NULL;
-
- g_slist_free(*msgnum_list);
-
- nummsgs = get_list_of_uids(session, folder, item, &uidlist);
- }
-
*msgnum_list = uidlist;
dir = folder_item_get_path((FolderItem *)item);
remove_numbered_files_not_in_list(dir, *msgnum_list);
g_free(dir);
- item->uid_next = uid_next;
-
debug_print("get_num_list - ok - %i\n", nummsgs);
statusbar_pop_all();
- unlock_session();
+ unlock_session(session);
+ item->should_trash_cache = FALSE;
+ item->should_update = FALSE;
return nummsgs;
}
g_return_val_if_fail(item != NULL, NULL);
g_return_val_if_fail(msgnum_list != NULL, NULL);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, NULL);
- lock_session();
+
debug_print("IMAP getting msginfos\n");
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL, FALSE);
if (ok != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return NULL;
}
if (!(folder_has_parent_of_type(item, F_DRAFT) ||
int i;
for (i = startnum; i <= lastnum; ++i) {
gchar *file;
-
+ unlock_session(session);
file = imap_fetch_msg(folder, item, i);
+ lock_session(session);
if (file != NULL) {
MsgInfo *msginfo = imap_parse_msg(file, item);
if (msginfo != NULL) {
g_slist_free(sorted_list);
}
- unlock_session();
+ unlock_session(session);
return ret;
}
if (item->item.path == NULL)
return FALSE;
+ if (item->should_update) {
+ debug_print("scan already required\n");
+ return TRUE;
+ }
+ debug_print("getting session...\n");
session = imap_session_get(folder);
g_return_val_if_fail(session != NULL, FALSE);
- lock_session();
+
selected_folder = (session->mbox != NULL) &&
(!strcmp(session->mbox, item->item.path));
- if (selected_folder && time(NULL) - item->use_cache < 2) {
- ok = imap_cmd_noop(session);
- if (ok != IMAP_SUCCESS) {
- debug_print("disconnected!\n");
- session = imap_reconnect_if_possible(folder, session);
- if (session == NULL)
- return FALSE;
- lock_session();
- }
+ if (selected_folder) {
+ if (!session->folder_content_changed) {
+ ok = imap_cmd_noop(session);
+ if (ok != IMAP_SUCCESS) {
+ debug_print("disconnected!\n");
+ session = imap_reconnect_if_possible(folder, session);
+ if (session == NULL)
+ return FALSE;
+ }
- if (session->folder_content_changed
- || session->exists != item->item.total_msgs) {
- unlock_session();
+ if (session->folder_content_changed) {
+ debug_print("CHANGED (self-noop)! scan_required\n");
+ unlock_session(session);
+ item->should_update = TRUE;
+ if (session->uid_validity && session->uid_validity != item->item.mtime) {
+ item->item.mtime = session->uid_validity;
+ item->should_trash_cache = TRUE;
+ }
+
+ return TRUE;
+ }
+ } else {
+ debug_print("CHANGED (previous noop)! scan_required\n");
+ unlock_session(session);
+ item->should_update = TRUE;
+ if (session->uid_validity && session->uid_validity != item->item.mtime) {
+ item->item.mtime = session->uid_validity;
+ item->should_trash_cache = TRUE;
+ }
return TRUE;
}
} else {
ok = imap_status(session, IMAP_FOLDER(folder), item->item.path, IMAP_FOLDER_ITEM(item),
&exists, &uid_next, &uid_val, &unseen, FALSE);
if (ok != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return FALSE;
}
- item->use_cache = time(NULL);
- item->c_messages = exists;
- item->c_uid_next = uid_next;
- item->c_uid_validity = uid_val;
- item->c_unseen = unseen;
- item->item.last_num = uid_next - 1;
- debug_print("uidnext %d, item->uid_next %d, exists %d, item->item.total_msgs %d\n",
- uid_next, item->uid_next, exists, item->item.total_msgs);
- if ((uid_next != item->uid_next) || (exists != item->item.total_msgs)
- || unseen != item->item.unread_msgs || uid_val != item->item.mtime) {
- unlock_session();
+ debug_print("exists %d, item->item.total_msgs %d\n",
+ exists, item->item.total_msgs);
+ if (exists != item->item.total_msgs
+ || unseen != item->item.unread_msgs
+ || uid_next != item->uid_next
+ || uid_val != item->item.mtime) {
+ unlock_session(session);
+ debug_print("CHANGED (status)! scan_required\n");
+ item->last_change = time(NULL);
+ item->should_update = TRUE;
+ item->uid_next = uid_next;
+ if (uid_val != item->item.mtime) {
+ item->item.mtime = uid_val;
+ item->should_trash_cache = TRUE;
+ }
return TRUE;
}
}
- unlock_session();
+ item->should_update = FALSE;
+ unlock_session(session);
return FALSE;
}
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder == item);
- session = imap_session_get(folder);
- if (!session) {
- return;
- }
-
if (!MSG_IS_MARKED(msginfo->flags) && (newflags & MSG_MARKED))
flags_set |= IMAP_FLAG_FLAGGED;
if ( MSG_IS_MARKED(msginfo->flags) && !(newflags & MSG_MARKED))
return;
}
- lock_session();
+ debug_print("getting session...\n");
+ session = imap_session_get(folder);
+ if (!session) {
+ return;
+ }
+
if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return;
}
numlist.next = NULL;
g_hash_table_insert(IMAP_FOLDER_ITEM(item)->flags_set_table,
GINT_TO_POINTER(flags_set), ht_data);
}
- if (!g_slist_find(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum)))
- ht_data->msglist = g_slist_prepend(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum));
+ ht_data->msglist = g_slist_prepend(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum));
}
if (flags_unset) {
ht_data = g_hash_table_lookup(IMAP_FOLDER_ITEM(item)->flags_unset_table,
g_hash_table_insert(IMAP_FOLDER_ITEM(item)->flags_unset_table,
GINT_TO_POINTER(flags_unset), ht_data);
}
- if (!g_slist_find(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum)))
- ht_data->msglist = g_slist_prepend(ht_data->msglist,
+ ht_data->msglist = g_slist_prepend(ht_data->msglist,
GINT_TO_POINTER(msginfo->msgnum));
}
} else {
if (flags_set) {
ok = imap_set_message_flags(session, &numlist, flags_set, TRUE);
if (ok != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return;
}
}
if (flags_unset) {
ok = imap_set_message_flags(session, &numlist, flags_unset, FALSE);
if (ok != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return;
}
}
}
msginfo->flags.perm_flags = newflags;
- unlock_session();
+ unlock_session(session);
return;
}
g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
g_return_val_if_fail(item != NULL, -1);
+ debug_print("getting session...\n");
session = imap_session_get(folder);
if (!session) return -1;
- lock_session();
+
ok = imap_select(session, IMAP_FOLDER(folder), item->path,
NULL, NULL, NULL, NULL, FALSE);
if (ok != IMAP_SUCCESS) {
- unlock_session();
+ unlock_session(session);
return ok;
}
numlist.next = NULL;
numlist.data = GINT_TO_POINTER(uid);
ok = imap_set_message_flags
- (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
- &numlist, IMAP_FLAG_DELETED, TRUE);
+ (session, &numlist, IMAP_FLAG_DELETED, TRUE);
if (ok != IMAP_SUCCESS) {
- log_warning(_("can't set deleted flags: %d\n"), uid);
- unlock_session();
+ log_warning(LOG_PROTOCOL, _("can't set deleted flags: %d\n"), uid);
+ unlock_session(session);
return ok;
}
g_free(uidstr);
}
if (ok != IMAP_SUCCESS) {
- log_warning(_("can't expunge\n"));
- unlock_session();
+ log_warning(LOG_PROTOCOL, _("can't expunge\n"));
+ unlock_session(session);
return ok;
}
if (is_dir_exist(dir))
remove_numbered_files(dir, uid, uid);
g_free(dir);
- unlock_session();
+ unlock_session(session);
return IMAP_SUCCESS;
}
{
get_flags_data *stuff = (get_flags_data *)data;
Folder *folder = stuff->folder;
- FolderItem *item = stuff->item;
+ FolderItem *fitem = (FolderItem *) stuff->item;
MsgInfoList *msginfo_list = stuff->msginfo_list;
GRelation *msgflags = stuff->msgflags;
- gboolean full_search = stuff->full_search;
+ GSList *elem;
+ carray * lep_uidtab;
IMAPSession *session;
+ gint ok;
+ int r;
+ GHashTable *flags_hash = NULL;
+ gboolean full_search = stuff->full_search;
GSList *sorted_list = NULL;
GSList *unseen = NULL, *answered = NULL, *flagged = NULL, *deleted = NULL;
GSList *p_unseen, *p_answered, *p_flagged, *p_deleted;
- GSList *elem;
GSList *seq_list, *cur;
gboolean reverse_seen = FALSE;
- GString *cmd_buf;
- gint ok;
- gint exists_cnt, unseen_cnt;
gboolean selected_folder;
+ gint exists_cnt, unseen_cnt;
- if (folder == NULL || item == NULL) {
- stuff->done = TRUE;
- return GINT_TO_POINTER(-1);
- }
-
session = imap_session_get(folder);
if (session == NULL) {
stuff->done = TRUE;
return GINT_TO_POINTER(-1);
}
- lock_session();
selected_folder = (session->mbox != NULL) &&
- (!strcmp(session->mbox, item->path));
+ (!strcmp(session->mbox, fitem->path));
if (!selected_folder) {
- ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+ ok = imap_select(session, IMAP_FOLDER(folder), fitem->path,
&exists_cnt, NULL, &unseen_cnt, NULL, TRUE);
if (ok != IMAP_SUCCESS) {
stuff->done = TRUE;
- unlock_session();
+ unlock_session(session);
return GINT_TO_POINTER(-1);
}
reverse_seen = TRUE;
}
else {
- if (item->unread_msgs > item->total_msgs / 2)
+ if (fitem->unread_msgs > fitem->total_msgs / 2)
reverse_seen = TRUE;
}
- cmd_buf = g_string_new(NULL);
-
sorted_list = g_slist_sort(g_slist_copy(msginfo_list), compare_msginfo);
if (!full_search) {
seq_list = imap_get_lep_set_from_msglist(msginfo_list);
seq_list = g_slist_append(NULL, set);
}
- for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
- struct mailimap_set * imapset;
- clist * lep_uidlist;
- int r;
-
- imapset = cur->data;
- if (reverse_seen) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN,
- full_search ? NULL:imapset, &lep_uidlist);
- }
- else {
- r = imap_threaded_search(folder,
- IMAP_SEARCH_TYPE_UNSEEN,
- full_search ? NULL:imapset, &lep_uidlist);
- }
- if (r == MAILIMAP_NO_ERROR) {
- GSList * uidlist;
-
- uidlist = imap_uid_list_from_lep(lep_uidlist);
- mailimap_search_result_free(lep_uidlist);
-
- unseen = g_slist_concat(unseen, uidlist);
- }
-
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED,
- full_search ? NULL:imapset, &lep_uidlist);
- if (r == MAILIMAP_NO_ERROR) {
- GSList * uidlist;
-
- uidlist = imap_uid_list_from_lep(lep_uidlist);
- mailimap_search_result_free(lep_uidlist);
+ if (folder->account && folder->account->low_bandwidth) {
+ for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
+ struct mailimap_set * imapset;
+ clist * lep_uidlist;
+ int r;
- flagged = g_slist_concat(flagged, uidlist);
- }
-
- if (item->opened || item->processing_pending || item == folder->inbox) {
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
- full_search ? NULL:imapset, &lep_uidlist);
+ imapset = cur->data;
+ if (reverse_seen) {
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN,
+ full_search ? NULL:imapset, &lep_uidlist);
+ }
+ else {
+ r = imap_threaded_search(folder,
+ IMAP_SEARCH_TYPE_UNSEEN,
+ full_search ? NULL:imapset, &lep_uidlist);
+ }
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
uidlist = imap_uid_list_from_lep(lep_uidlist);
mailimap_search_result_free(lep_uidlist);
- answered = g_slist_concat(answered, uidlist);
+ unseen = g_slist_concat(unseen, uidlist);
}
- r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED,
full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
uidlist = imap_uid_list_from_lep(lep_uidlist);
mailimap_search_result_free(lep_uidlist);
- deleted = g_slist_concat(deleted, uidlist);
+ flagged = g_slist_concat(flagged, uidlist);
}
- }
- }
- p_unseen = unseen;
- p_answered = answered;
- p_flagged = flagged;
- p_deleted = deleted;
+ if (fitem->opened || fitem->processing_pending || fitem == folder->inbox) {
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
+ full_search ? NULL:imapset, &lep_uidlist);
+ if (r == MAILIMAP_NO_ERROR) {
+ GSList * uidlist;
+ uidlist = imap_uid_list_from_lep(lep_uidlist);
+ mailimap_search_result_free(lep_uidlist);
+
+ answered = g_slist_concat(answered, uidlist);
+ }
+
+ r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
+ full_search ? NULL:imapset, &lep_uidlist);
+ if (r == MAILIMAP_NO_ERROR) {
+ GSList * uidlist;
+
+ uidlist = imap_uid_list_from_lep(lep_uidlist);
+ mailimap_search_result_free(lep_uidlist);
+
+ deleted = g_slist_concat(deleted, uidlist);
+ }
+ }
+ }
+ p_unseen = unseen;
+ p_answered = answered;
+ p_flagged = flagged;
+ p_deleted = deleted;
+
+ } else {
+ r = imap_threaded_fetch_uid_flags(folder, 1, &lep_uidtab);
+ if (r == MAILIMAP_NO_ERROR) {
+ flags_hash = g_hash_table_new_full(g_int_hash, g_int_equal, free, NULL);
+ imap_flags_hash_from_lep_uid_flags_tab(lep_uidtab, flags_hash);
+ imap_fetch_uid_flags_list_free(lep_uidtab);
+ }
+ }
for (elem = sorted_list; elem != NULL; elem = g_slist_next(elem)) {
MsgInfo *msginfo;
- MsgPermFlags flags;
+ MsgPermFlags flags, oldflags;
gboolean wasnew;
-
+
msginfo = (MsgInfo *) elem->data;
flags = msginfo->flags.perm_flags;
wasnew = (flags & MSG_NEW);
- if (item->opened || item->processing_pending || item == folder->inbox) {
- flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW) | MSG_REPLIED | MSG_MARKED);
- } else {
- flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW | MSG_MARKED));
- }
- if (reverse_seen)
- flags |= MSG_UNREAD | (wasnew ? MSG_NEW : 0);
- if (gslist_find_next_num(&p_unseen, msginfo->msgnum) == msginfo->msgnum) {
- if (!reverse_seen) {
- flags |= MSG_UNREAD | (wasnew ? MSG_NEW : 0);
+ oldflags = flags & ~(MSG_NEW|MSG_UNREAD|MSG_REPLIED|MSG_MARKED|MSG_DELETED);
+
+ if (folder->account && folder->account->low_bandwidth) {
+ if (fitem->opened || fitem->processing_pending || fitem == folder->inbox) {
+ flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW) | MSG_REPLIED | MSG_MARKED);
} else {
- flags &= ~(MSG_UNREAD | MSG_NEW);
+ flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW | MSG_MARKED));
+ }
+ if (reverse_seen)
+ flags |= MSG_UNREAD | (wasnew ? MSG_NEW : 0);
+ if (gslist_find_next_num(&p_unseen, msginfo->msgnum) == msginfo->msgnum) {
+ if (!reverse_seen) {
+ flags |= MSG_UNREAD | (wasnew ? MSG_NEW : 0);
+ } else {
+ flags &= ~(MSG_UNREAD | MSG_NEW);
+ }
}
- }
-
- if (gslist_find_next_num(&p_flagged, msginfo->msgnum) == msginfo->msgnum)
- flags |= MSG_MARKED;
- else
- flags &= ~MSG_MARKED;
- if (item->opened || item->processing_pending || item == folder->inbox) {
- if (gslist_find_next_num(&p_answered, msginfo->msgnum) == msginfo->msgnum)
- flags |= MSG_REPLIED;
- else
- flags &= ~MSG_REPLIED;
- if (gslist_find_next_num(&p_deleted, msginfo->msgnum) == msginfo->msgnum)
- flags |= MSG_DELETED;
+ if (gslist_find_next_num(&p_flagged, msginfo->msgnum) == msginfo->msgnum)
+ flags |= MSG_MARKED;
else
- flags &= ~MSG_DELETED;
+ flags &= ~MSG_MARKED;
+
+ if (fitem->opened || fitem->processing_pending || fitem == folder->inbox) {
+ if (gslist_find_next_num(&p_answered, msginfo->msgnum) == msginfo->msgnum)
+ flags |= MSG_REPLIED;
+ else
+ flags &= ~MSG_REPLIED;
+ if (gslist_find_next_num(&p_deleted, msginfo->msgnum) == msginfo->msgnum)
+ flags |= MSG_DELETED;
+ else
+ flags &= ~MSG_DELETED;
+ }
+ } else {
+ if (flags_hash != NULL) {
+ gint * puid;
+
+ puid = malloc(sizeof(* puid));
+ * puid = msginfo->msgnum;
+
+ flags = GPOINTER_TO_INT(g_hash_table_lookup(flags_hash, puid));
+ free(puid);
+ }
+
+ if ((flags & MSG_UNREAD) == 0)
+ flags &= ~MSG_NEW;
+ else if (wasnew)
+ flags |= MSG_NEW;
+ flags |= oldflags;
}
+
g_relation_insert(msgflags, msginfo, GINT_TO_POINTER(flags));
}
+
+ if (flags_hash)
+ g_hash_table_destroy(flags_hash);
imap_lep_set_free(seq_list);
g_slist_free(flagged);
g_slist_free(answered);
g_slist_free(unseen);
g_slist_free(sorted_list);
- g_string_free(cmd_buf, TRUE);
+ unlock_session(session);
stuff->done = TRUE;
- unlock_session();
return GINT_TO_POINTER(0);
}
GSList *tmp = NULL, *cur;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(FALSE,
+ _("Claws Mail needs network access in order "
"to access the IMAP server."))) {
g_free(data);
return -1;
IMAPFolderItem *_item = data->item;
FolderItem *item = (FolderItem *)_item;
gint ok = IMAP_ERROR;
- IMAPSession *session = imap_session_get(item->folder);
+ IMAPSession *session = NULL;
+
+ debug_print("getting session...\n");
+ session = imap_session_get(item->folder);
data->msglist = g_slist_reverse(data->msglist);
g_slist_length(data->msglist));
if (session) {
- lock_session();
ok = imap_select(session, IMAP_FOLDER(item->folder), item->path,
NULL, NULL, NULL, NULL, FALSE);
}
} else {
g_warning("can't select mailbox %s\n", item->path);
}
- if (session)
- unlock_session();
+
+ unlock_session(session);
g_slist_free(data->msglist);
g_free(data);
return TRUE;
g_hash_table_destroy(item->flags_unset_table);
item->flags_unset_table = NULL;
}
+
}
static void imap_set_batch (Folder *folder, FolderItem *_item, gboolean batch)
{
IMAPFolderItem *item = (IMAPFolderItem *)_item;
+ IMAPSession *session;
g_return_if_fail(item != NULL);
if (!item->flags_unset_table) {
item->flags_unset_table = g_hash_table_new(NULL, g_direct_equal);
}
+ session = imap_session_get(folder);
+ if (session) {
+ imap_refresh_sensitivity(session);
+ session->sens_update_block = TRUE;
+ unlock_session(session);
+ }
} else {
debug_print("IMAP switching away from batch mode\n");
/* process stuff */
process_hashtable(item);
item->batching = FALSE;
+ session = imap_session_get(folder);
+ if (session) {
+ unlock_session(session);
+ session->sens_update_block = FALSE;
+ imap_refresh_sensitivity(session);
+ }
}
}
-/* data types conversion libetpan <-> sylpheed */
+/* data types conversion libetpan <-> claws */
free(dup_name);
continue;
}
-
- if (!all && strcmp(dup_name, real_path) == 0) {
+ if (!all && path_cmp(name, real_path) == 0) {
g_free(base);
free(dup_name);
continue;
}
if (!all && dup_name[strlen(dup_name)-1] == '/') {
- g_free(base);
- free(dup_name);
- continue;
+ dup_name[strlen(dup_name)-1] = '\0';
}
loc_name = imap_modified_utf7_to_utf8(base);
return result;
}
+static void imap_flags_hash_from_lep_uid_flags_tab(carray * list,
+ GHashTable * hash)
+{
+ unsigned int i;
+ GSList * result;
+
+ result = NULL;
+
+ for(i = 0 ; i < carray_count(list) ; i += 2) {
+ uint32_t * puid;
+ int * pflags;
+ gint * pguid;
+
+ puid = carray_get(list, i);
+ pflags = carray_get(list, i + 1);
+ pguid = malloc(sizeof(* pguid));
+ * pguid = * puid;
+
+ g_hash_table_insert(hash, pguid, GINT_TO_POINTER(* pflags));
+ }
+}
+
static MsgInfo *imap_envelope_from_lep(struct imap_fetch_env_info * info,
FolderItem *item)
{
((IMAPFolder *)folder)->refcnt--;
}
+void imap_cancel_all(void)
+{
+ GList *folderlist;
+ GList *cur;
+
+ folderlist = folder_get_list();
+ for (cur = folderlist; cur != NULL; cur = g_list_next(cur)) {
+ Folder *folder = (Folder *) cur->data;
+
+ if (folder->klass == &imap_class) {
+ if (imap_is_busy(folder)) {
+ IMAPSession *imap_session;
+ RemoteFolder *rfolder;
+
+ fprintf(stderr, "cancelled\n");
+ imap_threaded_cancel(folder);
+ rfolder = (RemoteFolder *) folder;
+ imap_session = (IMAPSession *) rfolder->session;
+ if (imap_session)
+ imap_session->cancelled = 1;
+ }
+ }
+ }
+}
+
+gboolean imap_cancel_all_enabled(void)
+{
+ GList *folderlist;
+ GList *cur;
+
+ folderlist = folder_get_list();
+ for (cur = folderlist; cur != NULL; cur = g_list_next(cur)) {
+ Folder *folder = (Folder *) cur->data;
+
+ if (folder->klass == &imap_class) {
+ if (imap_is_busy(folder)) {
+ return TRUE;
+ }
+ }
+ }
+
+ return FALSE;
+}
+
+static gboolean imap_is_busy(Folder *folder)
+{
+ IMAPSession *imap_session;
+ RemoteFolder *rfolder;
+
+ rfolder = (RemoteFolder *) folder;
+ imap_session = (IMAPSession *) rfolder->session;
+ if (imap_session == NULL)
+ return FALSE;
+
+ return imap_session->busy;
+}
+
#else /* HAVE_LIBETPAN */
static FolderClass imap_class;
static Folder *imap_folder_new (const gchar *name,
const gchar *path)
{
+ static gboolean missing_imap_warning = TRUE;
+ if (missing_imap_warning) {
+ missing_imap_warning = FALSE;
+ alertpanel_error(
+ _("You have one or more IMAP accounts "
+ "defined. However this version of "
+ "Claws Mail has been built without "
+ "IMAP support; your IMAP account(s) are "
+ "disabled.\n\n"
+ "You probably need to "
+ "install libetpan and recompile "
+ "Claws Mail."));
+ }
return NULL;
}
static gint imap_create_tree (Folder *folder)
{
}
+gint imap_scan_tree_real(Folder *folder, gboolean subs_only)
+{
+ return -1;
+}
+
+gint imap_subscribe(Folder *folder, FolderItem *item, gchar *rpath, gboolean sub)
+{
+ return -1;
+}
+
+GList * imap_scan_subtree(Folder *folder, FolderItem *item, gboolean unsubs_only, gboolean recursive)
+{
+ return NULL;
+}
+
+void imap_cache_msg(FolderItem *item, gint msgnum)
+{
+}
+
+void imap_cancel_all(void)
+{
+}
+
+gboolean imap_cancel_all_enabled(void)
+{
+ return FALSE;
+}
+
#endif
-void imap_synchronise(FolderItem *item)
+void imap_synchronise(FolderItem *item, gint days)
{
- imap_gtk_synchronise(item);
+#ifdef HAVE_LIBETPAN
+ if (IMAP_FOLDER_ITEM(item)->last_sync == IMAP_FOLDER_ITEM(item)->last_change) {
+ debug_print("%s already synced\n", item->path?item->path:item->name);
+ return;
+ }
+ debug_print("syncing %s\n", item->path?item->path:item->name);
+ imap_gtk_synchronise(item, days);
+ IMAP_FOLDER_ITEM(item)->last_sync = IMAP_FOLDER_ITEM(item)->last_change;
+#endif
}
static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
if (!attr || !attr->name || !attr->value) continue;
if (!strcmp(attr->name, "uidnext"))
IMAP_FOLDER_ITEM(item)->uid_next = atoi(attr->value);
+ if (!strcmp(attr->name, "last_sync"))
+ IMAP_FOLDER_ITEM(item)->last_sync = atoi(attr->value);
+ if (!strcmp(attr->name, "last_change"))
+ IMAP_FOLDER_ITEM(item)->last_change = atoi(attr->value);
}
+ if (IMAP_FOLDER_ITEM(item)->last_change == 0)
+ IMAP_FOLDER_ITEM(item)->last_change = time(NULL);
#endif
}
#ifdef HAVE_LIBETPAN
xml_tag_add_attr(tag, xml_attr_new_int("uidnext",
IMAP_FOLDER_ITEM(item)->uid_next));
+ xml_tag_add_attr(tag, xml_attr_new_int("last_sync",
+ IMAP_FOLDER_ITEM(item)->last_sync));
+ xml_tag_add_attr(tag, xml_attr_new_int("last_change",
+ IMAP_FOLDER_ITEM(item)->last_change));
#endif
return tag;