#include "partial_download.h"
#include "mainwindow.h"
#include "summaryview.h"
+#include "log.h"
+#include "timing.h"
+#include "inc.h"
-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);
enum
{
Q_PRIVACY_SYSTEM = 9,
Q_ENCRYPT = 10,
Q_ENCRYPT_DATA = 11,
+ Q_SYLPHEED_HDRS = 12,
};
GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
MsgInfo *msginfo;
const gchar *msgid;
GSList *reflist;
-
+ START_TIMING("procmsg_get_thread_tree");
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("procmsg_get_thread_tree(1)");
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-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);
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) {
+ log_error(_("Already trying to send\n"));
+ 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);
file = folder_item_fetch_msg(queue, msginfo->msgnum);
if (file) {
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) < 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);
}
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-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);
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++ */
if (tmp_msginfo && (msginfo->dispositionnotificationto ||
msginfo->returnreceiptto)) {
procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0);
- procmsg_msginfo_free(msginfo); /* refcnt-- */
}
+ procmsg_msginfo_free(tmp_msginfo); /* refcnt-- */
}
return 0;
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)
{
static HeaderEntry qentry[] = {{"S:", NULL, FALSE},
{"SSV:", 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;
}
if (encrypt_data == NULL)
encrypt_data = g_strdup(p);
break;
+ case Q_SYLPHEED_HDRS:
+ /* 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 Sylpheed-Claws."));
+ }
mailval = -1;
-
+ }
fseek(fp, filepos, SEEK_SET);
if (newsgroup_list && (mailval == 0)) {
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);
}
return (newsval != 0 ? newsval : mailval);
}
-gint procmsg_send_message_queue(const gchar *file)
+gint procmsg_send_message_queue(const gchar *file, gchar **errstr)
{
- return procmsg_send_message_queue_full(file, FALSE);
+ gint result = procmsg_send_message_queue_full(file, FALSE, errstr);
+ 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 */
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");
* \return TRUE if the message was moved and MsgInfo is now invalid,
* FALSE otherwise
*/
-gboolean procmsg_msginfo_filter(MsgInfo *msginfo)
+gboolean procmsg_msginfo_filter(MsgInfo *msginfo, PrefsAccount* ac_prefs)
{
MailFilteringData mail_filtering_data;
/* 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;
}
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;
+}
projects / claws.git / blobdiff