static void imap_folder_destroy(Folder *folder)
{
- gchar *dir;
-
while (imap_folder_get_refcnt(folder) > 0)
gtk_main_iteration();
- dir = imap_folder_get_path(folder);
- if (is_dir_exist(dir))
- remove_dir_recursive(dir);
- g_free(dir);
-
folder_remote_folder_destroy(REMOTE_FOLDER(folder));
imap_done(folder);
}
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
- _("Con_tinue connecting"),
- GTK_STOCK_CANCEL, NULL,
- FALSE, NULL, ALERT_WARNING,
- G_ALERTALTERNATE) != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("Con_tinue connecting"),
+ NULL, FALSE, NULL, ALERT_WARNING,
+ G_ALERTDEFAULT) != G_ALERTALTERNATE)
return NULL;
}
port = account->set_imapport ? account->imapport
if (cached)
debug_print("message %d has been already %scached (%d/%d).\n", uid,
- have_size == cached->size ? "fully ":"",
+ have_size >= cached->size ? "fully ":"",
have_size, (int)cached->size);
- if (cached && (cached->size == have_size || !body)) {
+ if (cached && (cached->size <= have_size || !body)) {
procmsg_msginfo_free(cached);
procmsg_msginfo_free(msginfo);
file_strip_crs(filename);
IMAPFlags iflags = 0;
guint32 new_uid = 0;
gchar *real_file = NULL;
- gboolean file_is_tmp = FALSE;
fileinfo = (MsgFileInfo *)cur->data;
statusbar_progress_all(curnum, total, 1);
iflags |= IMAP_FLAG_SEEN;
}
- if (fileinfo->flags) {
- if ((MSG_IS_QUEUED(*fileinfo->flags)
- || MSG_IS_DRAFT(*fileinfo->flags))
- && !folder_has_parent_of_type(dest, F_QUEUE)
- && !folder_has_parent_of_type(dest, F_DRAFT)) {
- real_file = get_tmp_file();
- file_is_tmp = TRUE;
- if (procmsg_remove_special_headers(
- fileinfo->file,
- real_file) !=0) {
- g_free(real_file);
- g_free(destdir);
- unlock_session();
- return -1;
- }
- } else if (!(MSG_IS_QUEUED(*fileinfo->flags)
- || MSG_IS_DRAFT(*fileinfo->flags))
- && (folder_has_parent_of_type(dest, F_QUEUE)
- || folder_has_parent_of_type(dest, F_DRAFT))) {
- return -1;
- }
- }
if (real_file == NULL)
real_file = g_strdup(fileinfo->file);
if (ok != IMAP_SUCCESS) {
g_warning("can't append message %s\n", real_file);
- if (file_is_tmp)
- g_unlink(real_file);
g_free(real_file);
g_free(destdir);
unlock_session();
if (new_uid == 0) {
new_uid = dest->last_num+1;
}
- if (last_uid < new_uid)
+ if (last_uid < new_uid) {
last_uid = new_uid;
- if (file_is_tmp)
- g_unlink(real_file);
+ }
g_free(real_file);
}
return -1;
}
+ if (src->folder != dest->folder) {
+ GSList *infolist = NULL, *cur;
+ int res = -1;
+ for (cur = msglist; cur; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ MsgFileInfo *fileinfo = g_new0(MsgFileInfo, 1);
+ fileinfo->file = procmsg_get_message_file(msginfo);
+ fileinfo->flags = &(msginfo->flags);
+ infolist = g_slist_prepend(infolist, fileinfo);
+ }
+ infolist = g_slist_reverse(infolist);
+ res = folder_item_add_msgs(dest, infolist, FALSE);
+ for (cur = infolist; cur; cur = cur->next) {
+ MsgFileInfo *info = (MsgFileInfo *)cur->data;
+ g_free(info->file);
+ g_free(info);
+ }
+ g_slist_free(infolist);
+ return res;
+ }
+
ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
NULL, NULL, NULL, NULL, FALSE);
if (ok != IMAP_SUCCESS) {
MsgInfoList *msglist, GRelation *relation)
{
MsgInfo *msginfo;
- GSList *file_list;
gint ret;
g_return_val_if_fail(folder != NULL, -1);
msginfo = (MsgInfo *)msglist->data;
g_return_val_if_fail(msginfo->folder != NULL, -1);
- /* if from/to are the same "type" (with or without extra headers),
- * copy them via imap */
- if (folder == msginfo->folder->folder &&
- !folder_has_parent_of_type(msginfo->folder, F_DRAFT) &&
- !folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
- !folder_has_parent_of_type(dest, F_DRAFT) &&
- !folder_has_parent_of_type(dest, F_QUEUE)) {
- ret = imap_do_copy_msgs(folder, dest, msglist, relation);
- return ret;
- } else if (folder == msginfo->folder->folder &&
- (folder_has_parent_of_type(msginfo->folder, F_DRAFT) ||
- folder_has_parent_of_type(msginfo->folder, F_QUEUE)) &&
- (folder_has_parent_of_type(dest, F_DRAFT) ||
- folder_has_parent_of_type(dest, F_QUEUE))) {
- ret = imap_do_copy_msgs(folder, dest, msglist, relation);
- return ret;
- }
- /* else reupload them */
- file_list = procmsg_get_message_file_list(msglist);
- g_return_val_if_fail(file_list != NULL, -1);
-
- ret = imap_add_msgs(folder, dest, file_list, relation);
- procmsg_message_file_list_free(file_list);
-
+ ret = imap_do_copy_msgs(folder, dest, msglist, relation);
return ret;
}
static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest,
MsgInfoList *msglist, GRelation *relation)
{
- gchar *destdir;
+ gchar *destdir, *dir;
GSList *numlist = NULL, *cur;
MsgInfo *msginfo;
IMAPSession *session;
for (cur = msglist; cur; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
if (!MSG_IS_DELETED(msginfo->flags))
- numlist = g_slist_append(numlist, GINT_TO_POINTER(msginfo->msgnum));
+ numlist = g_slist_prepend(numlist, GINT_TO_POINTER(msginfo->msgnum));
}
+ numlist = g_slist_reverse(numlist);
uid_mapping = g_relation_new(2);
g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
return ok;
}
+ dir = folder_item_get_path(msginfo->folder);
+ if (is_dir_exist(dir)) {
+ for (cur = msglist; cur; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ remove_numbered_files(dir, msginfo->msgnum, msginfo->msgnum);
+ }
+ }
+ g_free(dir);
+
g_relation_destroy(uid_mapping);
g_slist_free(numlist);
return NULL;
}
+gchar imap_get_path_separator_for_item(FolderItem *item)
+{
+ Folder *folder = NULL;
+ IMAPFolder *imap_folder = NULL;
+ if (!item)
+ return '/';
+ folder = item->folder;
+
+ if (!folder)
+ return '/';
+
+ imap_folder = IMAP_FOLDER(folder);
+
+ if (!imap_folder)
+ return '/';
+
+ return imap_get_path_separator(imap_folder, item->path);
+}
static gchar imap_get_path_separator(IMAPFolder *folder, const gchar *path)
{
IMAPNameSpace *namespace;
gchar separator = '/';
+ IMAPSession *session = imap_session_get(FOLDER(folder));
+ g_return_val_if_fail(session != NULL, '/');
if (folder->last_seen_separator == 0) {
clist * lep_list;
type);
r = imap_threaded_login(session->folder, user, pass, type);
if (r != MAILIMAP_NO_ERROR) {
- log_error("IMAP4< Error logging in to %s\n",
+ log_print("IMAP4< Error logging in to %s\n",
SESSION(session)->server);
ok = IMAP_ERROR;
} else {
+ log_print("IMAP4< Login to %s successful\n",
+ SESSION(session)->server);
ok = IMAP_SUCCESS;
}
return ok;
{
IMAPFolderItem *item = (IMAPFolderItem *)_item;
IMAPSession *session;
- gint ok, nummsgs = 0, exists, uid_val, uid_next;
+ gint ok, nummsgs = 0, exists, uid_val, uid_next = 0;
GSList *uidlist = NULL;
gchar *dir;
gboolean selected_folder;
}
exists = session->exists;
+ uid_next = item->c_uid_next;
+ uid_val = item->c_uid_validity;
*old_uids_valid = TRUE;
} else {
if (item->use_cache && time(NULL) - item->use_cache < 2) {
else {
*old_uids_valid = FALSE;
- debug_print("Freeing imap uid cache\n");
+ debug_print("Freeing imap uid cache (%d != %d)\n",
+ item->item.mtime, uid_val);
item->lastuid = 0;
g_slist_free(item->uid_list);
item->uid_list = NULL;
imap_get_uncached_messages(session, item,
msgnum_list));
} else {
- MsgNumberList *sorted_list, *elem;
+ MsgNumberList *sorted_list, *elem, *llast = NULL;
gint startnum, lastnum;
sorted_list = g_slist_sort(g_slist_copy(msgnum_list), g_int_compare);
startnum = lastnum = GPOINTER_TO_INT(sorted_list->data);
+ llast = g_slist_last(ret);
for (elem = sorted_list;; elem = g_slist_next(elem)) {
guint num = 0;
MsgInfo *msginfo = imap_parse_msg(file, item);
if (msginfo != NULL) {
msginfo->msgnum = i;
- ret = g_slist_append(ret, msginfo);
+ if (llast == NULL)
+ llast = ret = g_slist_append(ret, msginfo);
+ else {
+ llast = g_slist_append(llast, msginfo);
+ llast = llast->next;
+ }
}
g_free(file);
}
if (!session) {
return;
}
- lock_session();
- if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
- NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS) {
- unlock_session();
- return;
- }
if (!MSG_IS_MARKED(msginfo->flags) && (newflags & MSG_MARKED))
flags_set |= IMAP_FLAG_FLAGGED;
if ( MSG_IS_DELETED(msginfo->flags) && !(newflags & MSG_DELETED))
flags_unset |= IMAP_FLAG_DELETED;
+ if (!flags_set && !flags_unset) {
+ /* the changed flags were not translatable to IMAP-speak.
+ * like MSG_POSTFILTERED, so just apply. */
+ msginfo->flags.perm_flags = newflags;
+ return;
+ }
+
+ lock_session();
+ if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+ NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS) {
+ unlock_session();
+ return;
+ }
numlist.next = NULL;
numlist.data = GINT_TO_POINTER(msginfo->msgnum);
imapset = cur->data;
if (reverse_seen) {
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN,
- imapset, &lep_uidlist);
+ full_search ? NULL:imapset, &lep_uidlist);
}
else {
r = imap_threaded_search(folder,
IMAP_SEARCH_TYPE_UNSEEN,
- imapset, &lep_uidlist);
+ full_search ? NULL:imapset, &lep_uidlist);
}
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
}
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED,
- imapset, &lep_uidlist);
+ full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
if (item->opened || item->processing_pending || item == folder->inbox) {
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
- imapset, &lep_uidlist);
+ full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
}
r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
- imapset, &lep_uidlist);
+ full_search ? NULL:imapset, &lep_uidlist);
if (r == MAILIMAP_NO_ERROR) {
GSList * uidlist;
clist * list, const gchar * real_path, gboolean all)
{
clistiter * iter;
- GSList * item_list;
-
- item_list = NULL;
+ GSList * item_list = NULL, *llast = NULL;
for(iter = clist_begin(list) ; iter != NULL ;
iter = clist_next(iter)) {
((flags & ETPAN_IMAP_MB_NOSELECT) != 0))
new_item->no_select = TRUE;
- item_list = g_slist_append(item_list, new_item);
-
+ 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);
g_free(loc_path);
{
GSList *sorted_list, *cur;
guint first, last, next;
- GSList *ret_list = NULL;
+ GSList *ret_list = NULL, *llast = NULL;
unsigned int count;
struct mailimap_set * current_set;
unsigned int item_count;
first = next;
if (count >= IMAP_SET_MAX_COUNT) {
- ret_list = g_slist_append(ret_list,
+ if (ret_list == NULL)
+ llast = ret_list = g_slist_append(ret_list,
current_set);
+ else {
+ llast = g_slist_append(llast, current_set);
+ llast = llast->next;
+ }
current_set = mailimap_set_new_empty();
count = 0;
item_count = 0;
for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
MsgInfo *msginfo = (MsgInfo *) cur->data;
- numlist = g_slist_append(numlist, GINT_TO_POINTER(msginfo->msgnum));
+ numlist = g_slist_prepend(numlist, GINT_TO_POINTER(msginfo->msgnum));
}
+ numlist = g_slist_reverse(numlist);
seq_list = imap_get_lep_set_from_numlist(numlist);
g_slist_free(numlist);
uint32_t * puid;
puid = clist_content(iter);
- result = g_slist_append(result, GINT_TO_POINTER(* puid));
+ result = g_slist_prepend(result, GINT_TO_POINTER(* puid));
}
+ result = g_slist_reverse(result);
return result;
}
uint32_t * puid;
puid = carray_get(list, i);
- result = g_slist_append(result, GINT_TO_POINTER(* puid));
+ result = g_slist_prepend(result, GINT_TO_POINTER(* puid));
}
-
+ result = g_slist_reverse(result);
return result;
}
return -1;
}
+gchar imap_get_path_separator_for_item(FolderItem *item)
+{
+ return '/';
+}
+
FolderClass *imap_get_class(void)
{
if (imap_class.idstr == NULL) {
static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
{
+#ifdef HAVE_LIBETPAN
GList *cur;
-
+#endif
folder_item_set_xml(folder, item, tag);
+#ifdef HAVE_LIBETPAN
for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
XMLAttr *attr = (XMLAttr *) cur->data;
if (!strcmp(attr->name, "uidnext"))
IMAP_FOLDER_ITEM(item)->uid_next = atoi(attr->value);
}
+#endif
}
static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item)
tag = folder_item_get_xml(folder, item);
+#ifdef HAVE_LIBETPAN
xml_tag_add_attr(tag, xml_attr_new_int("uidnext",
IMAP_FOLDER_ITEM(item)->uid_next));
+#endif
return tag;
}
projects / claws.git / blobdiff