/*
* 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
#include "partial_download.h"
#include "mainwindow.h"
#include "summaryview.h"
-
-static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session);
-
+#include "log.h"
+#include "timing.h"
+#include "inc.h"
+
+static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
+ FolderItem *queue, gint msgnum, gboolean *queued_removed);
+static void procmsg_update_unread_children (MsgInfo *info,
+ gboolean newly_marked);
enum
{
Q_SENDER = 0,
Q_PRIVACY_SYSTEM = 9,
Q_ENCRYPT = 10,
Q_ENCRYPT_DATA = 11,
+ Q_CLAWS_HDRS = 12,
+ Q_PRIVACY_SYSTEM_OLD = 13,
+ Q_ENCRYPT_OLD = 14,
+ Q_ENCRYPT_DATA_OLD = 15,
+ Q_CLAWS_HDRS_OLD = 16,
};
-GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
-{
- GHashTable *msg_table;
-
- if (mlist == NULL) return NULL;
-
- msg_table = g_hash_table_new(NULL, g_direct_equal);
- procmsg_msg_hash_table_append(msg_table, mlist);
-
- return msg_table;
-}
-
-void procmsg_msg_hash_table_append(GHashTable *msg_table, GSList *mlist)
-{
- GSList *cur;
- MsgInfo *msginfo;
-
- if (msg_table == NULL || mlist == NULL) return;
-
- for (cur = mlist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
-
- g_hash_table_insert(msg_table,
- GUINT_TO_POINTER(msginfo->msgnum),
- msginfo);
- }
-}
-
-GHashTable *procmsg_to_folder_hash_table_create(GSList *mlist)
-{
- GHashTable *msg_table;
- GSList *cur;
- MsgInfo *msginfo;
-
- if (mlist == NULL) return NULL;
-
- msg_table = g_hash_table_new(NULL, g_direct_equal);
-
- for (cur = mlist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- g_hash_table_insert(msg_table, msginfo->to_folder, msginfo);
- }
-
- return msg_table;
-}
-
-gint procmsg_get_last_num_in_msg_list(GSList *mlist)
-{
- GSList *cur;
- MsgInfo *msginfo;
- gint last = 0;
-
- for (cur = mlist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- if (msginfo && msginfo->msgnum > last)
- last = msginfo->msgnum;
- }
-
- return last;
-}
-
void procmsg_msg_list_free(GSList *mlist)
{
GSList *cur;
{
GNode *root, *parent, *node, *next;
GHashTable *msgid_table;
- GRelation *subject_relation;
+ GRelation *subject_relation = NULL;
MsgInfo *msginfo;
const gchar *msgid;
GSList *reflist;
-
+ START_TIMING("");
root = g_node_new(NULL);
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
- subject_relation = g_relation_new(2);
- g_relation_index(subject_relation, 0, g_str_hash, g_str_equal);
+
+ if (prefs_common.thread_by_subject) {
+ subject_relation = g_relation_new(2);
+ g_relation_index(subject_relation, 0, g_str_hash, g_str_equal);
+ }
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
}
if (prefs_common.thread_by_subject) {
+ START_TIMING("thread by subject");
for (node = root->children; node && node != NULL;) {
next = node->next;
msginfo = (MsgInfo *) node->data;
node = next;
}
+ END_TIMING();
}
- g_relation_destroy(subject_relation);
- g_hash_table_destroy(msgid_table);
+ if (prefs_common.thread_by_subject)
+ g_relation_destroy(subject_relation);
+ g_hash_table_destroy(msgid_table);
+ END_TIMING();
return root;
}
}
if (!dest) {
dest = msginfo->to_folder;
- movelist = g_slist_append(movelist, msginfo);
+ movelist = g_slist_prepend(movelist, msginfo);
} else if (dest == msginfo->to_folder) {
- movelist = g_slist_append(movelist, msginfo);
+ movelist = g_slist_prepend(movelist, msginfo);
} else {
continue;
}
procmsg_msginfo_set_to_folder(msginfo, NULL);
}
if (movelist) {
+ movelist = g_slist_reverse(movelist);
retval |= folder_item_move_msgs(dest, movelist);
g_slist_free(movelist);
movelist = NULL;
}
if (!dest) {
dest = msginfo->to_folder;
- copylist = g_slist_append(copylist, msginfo);
+ copylist = g_slist_prepend(copylist, msginfo);
} else if (dest == msginfo->to_folder) {
- copylist = g_slist_append(copylist, msginfo);
+ copylist = g_slist_prepend(copylist, msginfo);
} else {
continue;
}
procmsg_msginfo_set_to_folder(msginfo, NULL);
}
if (copylist) {
+ copylist = g_slist_reverse(copylist);
folder_item_copy_msgs(dest, copylist);
g_slist_free(copylist);
copylist = NULL;
if (MSG_IS_QUEUED(msginfo->flags) || MSG_IS_DRAFT(msginfo->flags)) {
gchar buf[BUFFSIZE];
- while (fgets(buf, sizeof(buf), fp) != NULL)
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ /* new way */
+ if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+ strlen("X-Claws-End-Special-Headers:"))) ||
+ (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+ strlen("X-Sylpheed-End-Special-Headers:"))))
+ break;
+ /* old way */
if (buf[0] == '\r' || buf[0] == '\n') break;
+ /* from other mailers */
+ if (!strncmp(buf, "Date: ", 6)
+ || !strncmp(buf, "To: ", 4)
+ || !strncmp(buf, "From: ", 6)
+ || !strncmp(buf, "Subject: ", 9)) {
+ rewind(fp);
+ break;
+ }
+ }
}
return fp;
} else if (hentry[H_SENDER].body != NULL) {
SET_FILTER_KEY("header \"Sender\"", H_SENDER);
} else if (hentry[H_LIST_POST].body != NULL) {
- SET_FILTER_KEY("header \"Sender\"", H_LIST_POST);
+ SET_FILTER_KEY("header \"List-Post\"", H_LIST_POST);
} else if (msginfo->to) {
*header = g_strdup("to");
*key = g_strdup(msginfo->to);
}
}
-void procmsg_empty_trash(FolderItem *trash)
+static void procmsg_empty_trash(FolderItem *trash)
{
GNode *node, *next;
{"SCF:", NULL, FALSE},
{"RMID:", NULL, FALSE},
{"FMID:", NULL, FALSE},
+ {"X-Claws-Privacy-System:", NULL, FALSE},
+ {"X-Claws-Encrypt:", NULL, FALSE},
+ {"X-Claws-Encrypt-Data:", NULL, FALSE},
+ {"X-Claws-End-Special-Headers", NULL, FALSE},
{"X-Sylpheed-Privacy-System:", NULL, FALSE},
{"X-Sylpheed-Encrypt:", NULL, FALSE},
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
return TRUE;
}
+static gboolean send_queue_lock = FALSE;
/*!
*\brief Send messages in queue
*
*\return Number of messages sent, negative if an error occurred
* positive if no error occurred
*/
-gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
+gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs, gchar **errstr)
{
gint sent = 0, err = 0;
GSList *list, *elem;
GSList *sorted_list = NULL;
GNode *node, *next;
-
+
+ if (send_queue_lock) {
+ /* Avoid having to translate two similar strings */
+ log_warning("%s\n", _("Already trying to send."));
+ if (errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("Already trying to send."));
+ }
+ toolbar_main_set_sensitive(mainwindow_get_mainwindow());
+ return -1;
+ }
+ send_queue_lock = TRUE;
+ inc_lock();
if (!queue)
queue = folder_get_default_queue();
- g_return_val_if_fail(queue != NULL, -1);
+
+ if (queue == NULL) {
+ send_queue_lock = FALSE;
+ inc_unlock();
+ return -1;
+ }
+
+ toolbar_main_set_sensitive(mainwindow_get_mainwindow());
folder_item_scan(queue);
list = folder_item_get_msg_list(queue);
if (!MSG_IS_LOCKED(msginfo->flags)) {
file = folder_item_fetch_msg(queue, msginfo->msgnum);
if (file) {
+ gboolean queued_removed = FALSE;
if (procmsg_send_message_queue_full(file,
- !procmsg_is_last_for_account(queue, msginfo, elem)) < 0) {
+ !procmsg_is_last_for_account(queue, msginfo, elem),
+ errstr, queue, msginfo->msgnum, &queued_removed) < 0) {
g_warning("Sending queued message %d failed.\n",
msginfo->msgnum);
err++;
} else {
- /* CLAWS:
- * We save in procmsg_send_message_queue because
- * we need the destination folder from the queue
- * header
-
- if (save_msgs)
- procmsg_save_to_outbox
- (queue->folder->outbox,
- file, TRUE);
- */
sent++;
- folder_item_remove_msg(queue, msginfo->msgnum);
+ if (!queued_removed)
+ folder_item_remove_msg(queue, msginfo->msgnum);
}
g_free(file);
}
while (node != NULL) {
int res = 0;
next = node->next;
- res = procmsg_send_queue(FOLDER_ITEM(node->data), save_msgs);
+ res = procmsg_send_queue(FOLDER_ITEM(node->data), save_msgs, errstr);
if (res < 0)
err = -res;
else
node = next;
}
}
+ send_queue_lock = FALSE;
+ inc_unlock();
+ toolbar_main_set_sensitive(mainwindow_get_mainwindow());
return (err != 0 ? -err : sent);
}
+gboolean procmsg_is_sending(void)
+{
+ return send_queue_lock;
+}
+
/*!
*\brief Determine if a queue folder is empty
*
fclose(fp);
return -1;
}
- while (fgets(buf, sizeof(buf), fp) != NULL)
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ /* new way */
+ if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+ strlen("X-Claws-End-Special-Headers:"))) ||
+ (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+ strlen("X-Sylpheed-End-Special-Headers:"))))
+ break;
+ /* old way */
if (buf[0] == '\r' || buf[0] == '\n') break;
+ /* from other mailers */
+ if (!strncmp(buf, "Date: ", 6)
+ || !strncmp(buf, "To: ", 4)
+ || !strncmp(buf, "From: ", 6)
+ || !strncmp(buf, "Subject: ", 9)) {
+ rewind(fp);
+ break;
+ }
+ }
while (fgets(buf, sizeof(buf), fp) != NULL)
fputs(buf, outfp);
fclose(outfp);
return 0;
}
-gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
+static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
gboolean is_queued)
{
gint num;
g_warning("can't save message\n");
return -1;
}
- return -1;
}
msginfo = folder_item_get_msginfo(outbox, num); /* refcnt++ */
tmp_msginfo = procmsg_msginfo_get_full_info(msginfo); /* refcnt++ */
procmsg_msginfo_unset_flags(msginfo, ~0, 0);
procmsg_msginfo_free(msginfo); /* refcnt-- */
/* tmp_msginfo == msginfo */
- if (tmp_msginfo && (msginfo->dispositionnotificationto ||
- msginfo->returnreceiptto)) {
+ if (tmp_msginfo && msginfo->extradata &&
+ (msginfo->extradata->dispositionnotificationto ||
+ msginfo->extradata->returnreceiptto)) {
procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0);
- procmsg_msginfo_free(msginfo); /* refcnt-- */
}
+ procmsg_msginfo_free(tmp_msginfo); /* refcnt-- */
}
return 0;
MEMBCOPY(folder);
MEMBCOPY(to_folder);
- MEMBDUP(face);
- MEMBDUP(xface);
- MEMBDUP(dispositionnotificationto);
- MEMBDUP(returnreceiptto);
+ if (msginfo->extradata) {
+ newmsginfo->extradata = g_new0(MsgInfoExtraData, 1);
+ MEMBDUP(extradata->face);
+ MEMBDUP(extradata->xface);
+ MEMBDUP(extradata->dispositionnotificationto);
+ MEMBDUP(extradata->returnreceiptto);
+ MEMBDUP(extradata->partial_recv);
+ MEMBDUP(extradata->account_server);
+ MEMBDUP(extradata->account_login);
+ MEMBDUP(extradata->list_post);
+ MEMBDUP(extradata->list_subscribe);
+ MEMBDUP(extradata->list_unsubscribe);
+ MEMBDUP(extradata->list_help);
+ MEMBDUP(extradata->list_archive);
+ MEMBDUP(extradata->list_owner);
+ }
refs = msginfo->references;
for (refs = msginfo->references; refs != NULL; refs = refs->next) {
g_free(file);
if (!full_msginfo) return NULL;
- /* CLAWS: make sure we add the missing members; see:
- * procheader.c::procheader_get_headernames() */
- if (!msginfo->list_post)
- msginfo->list_post = g_strdup(full_msginfo->list_post);
- if (!msginfo->list_subscribe)
- msginfo->list_subscribe = g_strdup(full_msginfo->list_subscribe);
- if (!msginfo->list_unsubscribe)
- msginfo->list_unsubscribe = g_strdup(full_msginfo->list_unsubscribe);
- if (!msginfo->list_help)
- msginfo->list_help = g_strdup(full_msginfo->list_help);
- if (!msginfo->list_archive)
- msginfo->list_archive= g_strdup(full_msginfo->list_archive);
- if (!msginfo->list_owner)
- msginfo->list_owner = g_strdup(full_msginfo->list_owner);
- if (!msginfo->xface)
- msginfo->xface = g_strdup(full_msginfo->xface);
- if (!msginfo->face)
- msginfo->face = g_strdup(full_msginfo->face);
- if (!msginfo->dispositionnotificationto)
- msginfo->dispositionnotificationto =
- g_strdup(full_msginfo->dispositionnotificationto);
- if (!msginfo->returnreceiptto)
- msginfo->returnreceiptto = g_strdup
- (full_msginfo->returnreceiptto);
- if (!msginfo->partial_recv && full_msginfo->partial_recv)
- msginfo->partial_recv = g_strdup
- (full_msginfo->partial_recv);
msginfo->total_size = full_msginfo->total_size;
- if (!msginfo->account_server && full_msginfo->account_server)
- msginfo->account_server = g_strdup
- (full_msginfo->account_server);
- if (!msginfo->account_login && full_msginfo->account_login)
- msginfo->account_login = g_strdup
- (full_msginfo->account_login);
msginfo->planned_download = full_msginfo->planned_download;
+
+ if (full_msginfo->extradata) {
+ if (!msginfo->extradata)
+ msginfo->extradata = g_new0(MsgInfoExtraData, 1);
+ if (!msginfo->extradata->list_post)
+ msginfo->extradata->list_post = g_strdup(full_msginfo->extradata->list_post);
+ if (!msginfo->extradata->list_subscribe)
+ msginfo->extradata->list_subscribe = g_strdup(full_msginfo->extradata->list_subscribe);
+ if (!msginfo->extradata->list_unsubscribe)
+ msginfo->extradata->list_unsubscribe = g_strdup(full_msginfo->extradata->list_unsubscribe);
+ if (!msginfo->extradata->list_help)
+ msginfo->extradata->list_help = g_strdup(full_msginfo->extradata->list_help);
+ if (!msginfo->extradata->list_archive)
+ msginfo->extradata->list_archive= g_strdup(full_msginfo->extradata->list_archive);
+ if (!msginfo->extradata->list_owner)
+ msginfo->extradata->list_owner = g_strdup(full_msginfo->extradata->list_owner);
+ if (!msginfo->extradata->xface)
+ msginfo->extradata->xface = g_strdup(full_msginfo->extradata->xface);
+ if (!msginfo->extradata->face)
+ msginfo->extradata->face = g_strdup(full_msginfo->extradata->face);
+ if (!msginfo->extradata->dispositionnotificationto)
+ msginfo->extradata->dispositionnotificationto =
+ g_strdup(full_msginfo->extradata->dispositionnotificationto);
+ if (!msginfo->extradata->returnreceiptto)
+ msginfo->extradata->returnreceiptto = g_strdup
+ (full_msginfo->extradata->returnreceiptto);
+ if (!msginfo->extradata->partial_recv && full_msginfo->extradata->partial_recv)
+ msginfo->extradata->partial_recv = g_strdup
+ (full_msginfo->extradata->partial_recv);
+ if (!msginfo->extradata->account_server && full_msginfo->extradata->account_server)
+ msginfo->extradata->account_server = g_strdup
+ (full_msginfo->extradata->account_server);
+ if (!msginfo->extradata->account_login && full_msginfo->extradata->account_login)
+ msginfo->extradata->account_login = g_strdup
+ (full_msginfo->extradata->account_login);
+ }
procmsg_msginfo_free(full_msginfo);
return procmsg_msginfo_new_ref(msginfo);
}
g_free(msginfo->fromspace);
- g_free(msginfo->returnreceiptto);
- g_free(msginfo->dispositionnotificationto);
- g_free(msginfo->xface);
- g_free(msginfo->face);
g_free(msginfo->fromname);
g_free(msginfo->inreplyto);
g_free(msginfo->xref);
- g_free(msginfo->list_post);
- g_free(msginfo->list_subscribe);
- g_free(msginfo->list_unsubscribe);
- g_free(msginfo->list_help);
- g_free(msginfo->list_archive);
- g_free(msginfo->list_owner);
-
- g_free(msginfo->partial_recv);
- g_free(msginfo->account_server);
- g_free(msginfo->account_login);
-
+ if (msginfo->extradata) {
+ g_free(msginfo->extradata->returnreceiptto);
+ g_free(msginfo->extradata->dispositionnotificationto);
+ g_free(msginfo->extradata->xface);
+ g_free(msginfo->extradata->face);
+ g_free(msginfo->extradata->list_post);
+ g_free(msginfo->extradata->list_subscribe);
+ g_free(msginfo->extradata->list_unsubscribe);
+ g_free(msginfo->extradata->list_help);
+ g_free(msginfo->extradata->list_archive);
+ g_free(msginfo->extradata->list_owner);
+ g_free(msginfo->extradata->partial_recv);
+ g_free(msginfo->extradata->account_server);
+ g_free(msginfo->extradata->account_login);
+ g_free(msginfo->extradata);
+ }
slist_free_strings(msginfo->references);
g_slist_free(msginfo->references);
memusage += strlen(msginfo->msgid);
if (msginfo->inreplyto)
memusage += strlen(msginfo->inreplyto);
- if (msginfo->xface)
- memusage += strlen(msginfo->xface);
- if (msginfo->face)
- memusage += strlen(msginfo->face);
- if (msginfo->dispositionnotificationto)
- memusage += strlen(msginfo->dispositionnotificationto);
- if (msginfo->returnreceiptto)
- memusage += strlen(msginfo->returnreceiptto);
for (refs = msginfo->references; refs; refs=refs->next) {
gchar *r = (gchar *)refs->data;
memusage += r?strlen(r):0;
if (msginfo->fromspace)
memusage += strlen(msginfo->fromspace);
+ if (msginfo->extradata) {
+ memusage += sizeof(MsgInfoExtraData);
+ if (msginfo->extradata->xface)
+ memusage += strlen(msginfo->extradata->xface);
+ if (msginfo->extradata->face)
+ memusage += strlen(msginfo->extradata->face);
+ if (msginfo->extradata->dispositionnotificationto)
+ memusage += strlen(msginfo->extradata->dispositionnotificationto);
+ if (msginfo->extradata->returnreceiptto)
+ memusage += strlen(msginfo->extradata->returnreceiptto);
+
+ if (msginfo->extradata->partial_recv)
+ memusage += strlen(msginfo->extradata->partial_recv);
+ if (msginfo->extradata->account_server)
+ memusage += strlen(msginfo->extradata->account_server);
+ if (msginfo->extradata->account_login)
+ memusage += strlen(msginfo->extradata->account_login);
+
+ if (msginfo->extradata->list_post)
+ memusage += strlen(msginfo->extradata->list_post);
+ if (msginfo->extradata->list_subscribe)
+ memusage += strlen(msginfo->extradata->list_subscribe);
+ if (msginfo->extradata->list_unsubscribe)
+ memusage += strlen(msginfo->extradata->list_unsubscribe);
+ if (msginfo->extradata->list_help)
+ memusage += strlen(msginfo->extradata->list_help);
+ if (msginfo->extradata->list_archive)
+ memusage += strlen(msginfo->extradata->list_archive);
+ if (msginfo->extradata->list_owner)
+ memusage += strlen(msginfo->extradata->list_owner);
+ }
return memusage;
}
-gint procmsg_cmp_msgnum_for_sort(gconstpointer a, gconstpointer b)
-{
- const MsgInfo *msginfo1 = a;
- const MsgInfo *msginfo2 = b;
-
- if (!msginfo1)
- return -1;
- if (!msginfo2)
- return -1;
-
- return msginfo1->msgnum - msginfo2->msgnum;
-}
-
-static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session)
+static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
+ FolderItem *queue, gint msgnum, gboolean *queued_removed)
{
static HeaderEntry qentry[] = {{"S:", NULL, FALSE},
{"SSV:", NULL, FALSE},
{"SCF:", NULL, FALSE},
{"RMID:", NULL, FALSE},
{"FMID:", NULL, FALSE},
+ {"X-Claws-Privacy-System:", NULL, FALSE},
+ {"X-Claws-Encrypt:", NULL, FALSE},
+ {"X-Claws-Encrypt-Data:", NULL, FALSE},
+ {"X-Claws-End-Special-Headers:", NULL, FALSE},
{"X-Sylpheed-Privacy-System:", NULL, FALSE},
{"X-Sylpheed-Encrypt:", NULL, FALSE},
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
+ {"X-Sylpheed-End-Special-Headers:", NULL, FALSE},
{NULL, NULL, FALSE}};
FILE *fp;
gint filepos;
if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
+ if (errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("Couldn't open file %s."), file);
+ }
return -1;
}
fwdmessageid = g_strdup(p);
break;
case Q_PRIVACY_SYSTEM:
+ case Q_PRIVACY_SYSTEM_OLD:
if (privacy_system == NULL)
privacy_system = g_strdup(p);
break;
case Q_ENCRYPT:
+ case Q_ENCRYPT_OLD:
if (p[0] == '1')
encrypt = TRUE;
break;
case Q_ENCRYPT_DATA:
+ case Q_ENCRYPT_DATA_OLD:
if (encrypt_data == NULL)
encrypt_data = g_strdup(p);
break;
+ case Q_CLAWS_HDRS:
+ case Q_CLAWS_HDRS_OLD:
+ /* end of special headers reached */
+ goto send_mail; /* can't "break;break;" */
}
}
+send_mail:
filepos = ftell(fp);
if (encrypt) {
g_free(fwdmessageid);
g_free(privacy_system);
g_free(encrypt_data);
+ if (errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("Couldn't encrypt the email: %s"),
+ privacy_get_error());
+ }
return -1;
}
if (to_list) {
debug_print("Sending message by mail\n");
if (!from) {
- g_warning("Queued message header is broken.\n");
+ if (errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("Queued message header is broken."));
+ }
mailval = -1;
} else if (mailac && mailac->use_mail_command &&
mailac->mail_command && (* mailac->mail_command)) {
}
}
- if (mailac)
+ if (mailac) {
mailval = send_message_smtp_full(mailac, to_list, fp, keep_session);
- else {
+ if (mailval == -1 && errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("An error happened during SMTP session."));
+ }
+ } else {
PrefsAccount tmp_ac;
g_warning("Account not found.\n");
tmp_ac.smtp_server = smtpserver;
tmp_ac.smtpport = SMTP_PORT;
mailval = send_message_smtp(&tmp_ac, to_list, fp);
+ if (mailval == -1 && errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("No specific account has been found to "
+ "send, and an error happened during SMTP session."));
+ }
}
}
- } else if (!to_list && !newsgroup_list)
+ } else if (!to_list && !newsgroup_list) {
+ if (errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup(_("Couldn't determine sending informations. "
+ "Maybe the email hasn't been generated by Claws Mail."));
+ }
mailval = -1;
-
+ }
fseek(fp, filepos, SEEK_SET);
if (newsgroup_list && (mailval == 0)) {
FILE *tmpfp;
/* write to temporary file */
- tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)file);
+ tmp = g_strdup_printf("%s%ctmp%p", g_get_tmp_dir(),
+ G_DIR_SEPARATOR, file);
if ((tmpfp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
newsval = -1;
- alertpanel_error(_("Could not create temporary file for news sending."));
+ alertpanel_error(_("Couldn't create temporary file for news sending."));
} else {
if (change_file_mode_rw(tmpfp, tmp) < 0) {
FILE_OP_ERROR(tmp, "chmod");
if (fputs(buf, tmpfp) == EOF) {
FILE_OP_ERROR(tmp, "fputs");
newsval = -1;
- alertpanel_error(_("Error when writing temporary file for news sending."));
+ if (errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("Error when writing temporary file for news sending."));
+ }
}
}
fclose(tmpfp);
folder = FOLDER(newsac->folder);
newsval = news_post(folder, tmp);
- if (newsval < 0) {
- alertpanel_error(_("Error occurred while posting the message to %s ."),
- newsac->nntp_server);
- }
+ if (newsval < 0 && errstr) {
+ if (*errstr) g_free(*errstr);
+ *errstr = g_strdup_printf(_("Error occurred while posting the message to %s."),
+ newsac->nntp_server);
+ }
}
g_unlink(tmp);
}
outbox = folder_get_default_outbox();
if (save_clear_text || tmp_enc_file == NULL) {
- procmsg_save_to_outbox(outbox, file, TRUE);
+ gboolean saved = FALSE;
+ *queued_removed = FALSE;
+ if (queue && msgnum > 0) {
+ MsgInfo *queued_mail = folder_item_get_msginfo(queue, msgnum);
+ if (folder_item_move_msg(outbox, queued_mail) >= 0) {
+ debug_print("moved queued mail %d to sent folder\n", msgnum);
+ saved = TRUE;
+ *queued_removed = TRUE;
+ } else if (folder_item_copy_msg(outbox, queued_mail) >= 0) {
+ debug_print("copied queued mail %d to sent folder\n", msgnum);
+ saved = TRUE;
+ }
+ procmsg_msginfo_free(queued_mail);
+ }
+ if (!saved) {
+ debug_print("resaving clear text queued mail to sent folder\n");
+ procmsg_save_to_outbox(outbox, file, TRUE);
+ }
} else {
+ debug_print("saving encrpyted queued mail to sent folder\n");
procmsg_save_to_outbox(outbox, tmp_enc_file, FALSE);
}
}
return (newsval != 0 ? newsval : mailval);
}
-gint procmsg_send_message_queue(const gchar *file)
+gint procmsg_send_message_queue(const gchar *file, gchar **errstr, FolderItem *queue, gint msgnum, gboolean *queued_removed)
{
- return procmsg_send_message_queue_full(file, FALSE);
+ gint result = procmsg_send_message_queue_full(file, FALSE, errstr, queue, msgnum, queued_removed);
+ toolbar_main_set_sensitive(mainwindow_get_mainwindow());
+ return result;
}
static void update_folder_msg_counts(FolderItem *item, MsgInfo *msginfo, MsgPermFlags old_flags)
folder_item_change_msg_flags(msginfo->folder, msginfo, perm_flags_new);
update_folder_msg_counts(item, msginfo, perm_flags_old);
-
- msginfo_update.msginfo = msginfo;
- msginfo_update.flags = MSGINFO_UPDATE_FLAGS;
- hooks_invoke(MSGINFO_UPDATE_HOOKLIST, &msginfo_update);
- folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT);
}
/* Tmp flags hanlding */
*
*\return gboolean TRUE if perm_flags are found
*/
-gboolean procmsg_msg_has_flagged_parent_real(MsgInfo *info,
+static gboolean procmsg_msg_has_flagged_parent_real(MsgInfo *info,
MsgPermFlags perm_flags, GHashTable *parentmsgs)
{
MsgInfo *tmp;
gboolean result;
if (g_hash_table_lookup(parentmsgs, info)) {
- debug_print("loop detected: %s%c%d\n",
- folder_item_get_path(info->folder),
- G_DIR_SEPARATOR, info->msgnum);
+ debug_print("loop detected: %d\n",
+ info->msgnum);
result = FALSE;
} else {
g_hash_table_insert(parentmsgs, info, "1");
/*!
*\brief Callback for cleaning up hash of parentmsgs
*/
-gboolean parentmsgs_hash_remove(gpointer key,
+static gboolean parentmsgs_hash_remove(gpointer key,
gpointer value,
gpointer user_data)
{
gboolean procmsg_msg_has_flagged_parent(MsgInfo *info, MsgPermFlags perm_flags)
{
gboolean result;
- GHashTable *parentmsgs = g_hash_table_new(NULL, NULL);
+ static GHashTable *parentmsgs = NULL;
+
+ if (parentmsgs == NULL)
+ parentmsgs = g_hash_table_new(NULL, NULL);
result = procmsg_msg_has_flagged_parent_real(info, perm_flags, parentmsgs);
g_hash_table_foreach_remove(parentmsgs, parentmsgs_hash_remove, NULL);
- g_hash_table_destroy(parentmsgs);
+
return result;
}
}
-GSList *procmsg_find_children_func(MsgInfo *info,
+static GSList *procmsg_find_children_func(MsgInfo *info,
GSList *children, GSList *all)
{
GSList *cur;
return children;
}
-GSList *procmsg_find_children (MsgInfo *info)
+static GSList *procmsg_find_children (MsgInfo *info)
{
GSList *children;
GSList *all, *cur;
return children;
}
-void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
+static void procmsg_update_unread_children(MsgInfo *info, gboolean newly_marked)
{
GSList *children = procmsg_find_children(info);
GSList *cur;
* \return TRUE if the message was moved and MsgInfo is now invalid,
* FALSE otherwise
*/
-gboolean procmsg_msginfo_filter(MsgInfo *msginfo)
+static gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
{
MailFilteringData mail_filtering_data;
mail_filtering_data.msginfo = msginfo;
+ mail_filtering_data.msglist = NULL;
+ mail_filtering_data.filtered = NULL;
+ mail_filtering_data.unfiltered = NULL;
if (hooks_invoke(MAIL_FILTERING_HOOKLIST, &mail_filtering_data)) {
return TRUE;
}
/* filter if enabled in prefs or move to inbox if not */
if((filtering_rules != NULL) &&
- filter_message_by_msginfo(filtering_rules, msginfo)) {
+ filter_message_by_msginfo(filtering_rules, msginfo, ac_prefs)) {
return TRUE;
}
return FALSE;
}
+void procmsg_msglist_filter(GSList *list, PrefsAccount *ac,
+ GSList **filtered, GSList **unfiltered,
+ gboolean do_filter)
+{
+ GSList *cur, *to_do = NULL;
+ gint total = 0, curnum = 0;
+ MailFilteringData mail_filtering_data;
+
+ g_return_if_fail(filtered != NULL);
+ g_return_if_fail(unfiltered != NULL);
+
+ *filtered = NULL;
+ *unfiltered = NULL;
+
+ if (list == NULL)
+ return;
+
+ total = g_slist_length(list);
+
+ if (!do_filter) {
+ *filtered = NULL;
+ *unfiltered = g_slist_copy(list);
+ return;
+ }
+
+ statusbar_print_all(_("Filtering messages...\n"));
+
+ mail_filtering_data.msginfo = NULL;
+ mail_filtering_data.msglist = list;
+ mail_filtering_data.filtered = NULL;
+ mail_filtering_data.unfiltered = NULL;
+
+ hooks_invoke(MAIL_LISTFILTERING_HOOKLIST, &mail_filtering_data);
+
+ if (mail_filtering_data.filtered == NULL &&
+ mail_filtering_data.unfiltered == NULL) {
+ /* nothing happened */
+ debug_print(MAIL_LISTFILTERING_HOOKLIST " did nothing. filtering whole list normally.\n");
+ to_do = list;
+ }
+ if (mail_filtering_data.filtered != NULL) {
+ /* keep track of what's been filtered by the hooks */
+ debug_print(MAIL_LISTFILTERING_HOOKLIST " filtered some stuff. total %d filtered %d unfilt %d.\n",
+ g_slist_length(list),
+ g_slist_length(mail_filtering_data.filtered),
+ g_slist_length(mail_filtering_data.unfiltered));
+
+ *filtered = g_slist_copy(mail_filtering_data.filtered);
+ }
+ if (mail_filtering_data.unfiltered != NULL) {
+ /* what the hooks didn't handle will go in filtered or
+ * unfiltered in the next loop */
+ debug_print(MAIL_LISTFILTERING_HOOKLIST " left unfiltered stuff. total %d filtered %d unfilt %d.\n",
+ g_slist_length(list),
+ g_slist_length(mail_filtering_data.filtered),
+ g_slist_length(mail_filtering_data.unfiltered));
+ to_do = mail_filtering_data.unfiltered;
+ }
+
+ for (cur = to_do; cur; cur = cur->next) {
+ MsgInfo *info = (MsgInfo *)cur->data;
+ if (procmsg_msginfo_filter(info, ac))
+ *filtered = g_slist_prepend(*filtered, info);
+ else
+ *unfiltered = g_slist_prepend(*unfiltered, info);
+ statusbar_progress_all(curnum++, total, prefs_common.statusbar_update_step);
+ }
+
+ g_slist_free(mail_filtering_data.filtered);
+ g_slist_free(mail_filtering_data.unfiltered);
+
+ *filtered = g_slist_reverse(*filtered);
+ *unfiltered = g_slist_reverse(*unfiltered);
+
+ statusbar_progress_all(0,0,0);
+ statusbar_pop_all();
+}
+
MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimeinfo)
{
MsgInfo *tmp_msginfo = NULL;
FolderItem *item = spam_folder_item ? folder_find_item_from_identifier(spam_folder_item) : NULL;
return item ? item : folder_get_default_trash();
}
+
+static void item_has_queued_mails(FolderItem *item, gpointer data)
+{
+ gboolean *result = (gboolean *)data;
+ if (*result == TRUE)
+ return;
+ if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0)
+ *result = TRUE;
+}
+
+gboolean procmsg_have_queued_mails_fast (void)
+{
+ gboolean result = FALSE;
+ folder_func_to_all_folders(item_has_queued_mails, &result);
+ return result;
+}