/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
*
* 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 "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#include "intl.h"
#include "main.h"
#include "utils.h"
#include "procmsg.h"
#include "folder.h"
#include "prefs_common.h"
#include "account.h"
-#if USE_GPGME
-# include "rfc2015.h"
-#endif
#include "alertpanel.h"
#include "news.h"
#include "hooks.h"
#include "msgcache.h"
+#include "partial_download.h"
GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
{
gint first;
};
-static gboolean procmsg_ignore_node(GNode *node, gpointer data)
-{
- MsgInfo *msginfo = (MsgInfo *)node->data;
-
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
-
- return FALSE;
-}
-
/* CLAWS subject threading:
- in the first round it inserts subject lines in a hash
- table. a duplicate subject line replaces the one in
- the table only if its older. (this round should actually
- create a list of all duplicate subject lines)
+ in the first round it inserts subject lines in a
+ relation (subject <-> node)
the second round finishes the threads by attaching
- duplicate subject lines to the one found in the
- hash table. as soon as a subject line is found that
- is too old, that one becomes the new parent for
- the next iteration. (this fails when a parent arrived
- later than its child.)
+ matching subject lines to the one found in the
+ relation. will use the oldest node with the same
+ subject that is not more then thread_by_subject_max_age
+ days old (see subject_relation_lookup)
*/
+static void subject_relation_insert(GRelation *relation, GNode *node)
+{
+ gchar *subject;
+ MsgInfo *msginfo;
+
+ g_return_if_fail(relation != NULL);
+ g_return_if_fail(node != NULL);
+ msginfo = (MsgInfo *) node->data;
+ g_return_if_fail(msginfo != NULL);
+
+ subject = msginfo->subject;
+ if (subject == NULL)
+ return;
+ subject += subject_get_prefix_length(subject);
+
+ g_relation_insert(relation, subject, node);
+}
+
+static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
+{
+ gchar *subject;
+ GTuples *tuples;
+ GNode *node = NULL;
+ gint prefix_length;
+
+ g_return_val_if_fail(relation != NULL, NULL);
+
+ subject = msginfo->subject;
+ if (subject == NULL)
+ return NULL;
+ prefix_length = subject_get_prefix_length(subject);
+ if (prefix_length <= 0)
+ return NULL;
+ subject += prefix_length;
+
+ tuples = g_relation_select(relation, subject, 0);
+ if (tuples == NULL)
+ return NULL;
+
+ if (tuples->len > 0) {
+ int i;
+ GNode *relation_node;
+ MsgInfo *relation_msginfo = NULL, *best_msginfo = NULL;
+ gboolean match;
+
+ /* check all nodes with the same subject to find the best parent */
+ for (i = 0; i < tuples->len; i++) {
+ relation_node = (GNode *) g_tuples_index(tuples, i, 1);
+ relation_msginfo = (MsgInfo *) relation_node->data;
+ match = FALSE;
+
+ /* best node should be the oldest in the found nodes */
+ /* parent node must not be older then msginfo */
+ if ((relation_msginfo->date_t < msginfo->date_t) &&
+ ((best_msginfo == NULL) ||
+ (best_msginfo->date_t > relation_msginfo->date_t)))
+ match = TRUE;
+
+ /* parent node must not be more then thread_by_subject_max_age
+ days older then msginfo */
+ if (abs(difftime(msginfo->date_t, relation_msginfo->date_t)) >
+ prefs_common.thread_by_subject_max_age * 3600 * 24)
+ match = FALSE;
+
+ /* can add new tests for all matching
+ nodes found by subject */
+
+ if (match) {
+ node = relation_node;
+ best_msginfo = relation_msginfo;
+ }
+ }
+ }
+
+ g_tuples_destroy(tuples);
+ return node;
+}
+
/* return the reversed thread tree */
GNode *procmsg_get_thread_tree(GSList *mlist)
{
- GNode *root, *parent, *node, *next, *last;
- GNode *prev; /* CLAWS */
+ GNode *root, *parent, *node, *next;
GHashTable *msgid_table;
- GHashTable *subject_table;
+ GRelation *subject_relation;
MsgInfo *msginfo;
const gchar *msgid;
- const gchar *subject;
root = g_node_new(NULL);
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
- subject_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);
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
if (parent == NULL) {
parent = root;
- } else {
- if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
- }
}
}
node = g_node_insert_data_before
(parent, parent == root ? parent->children : NULL,
msginfo);
- if ((msgid = msginfo->msgid) &&
- g_hash_table_lookup(msgid_table, msgid) == NULL)
+ if ((msgid = msginfo->msgid) && g_hash_table_lookup(msgid_table, msgid) == NULL)
g_hash_table_insert(msgid_table, (gchar *)msgid, node);
- /* CLAWS: add subject to table (without prefix) */
+ /* CLAWS: add subject to relation (without prefix) */
if (prefs_common.thread_by_subject) {
- GNode *found_subject = NULL;
-
- subject = msginfo->subject;
- subject += subject_get_prefix_length(subject);
- found_subject = subject_table_lookup_clean
- (subject_table, (gchar *) subject);
-
- if (found_subject == NULL)
- subject_table_insert_clean(subject_table, (gchar *) subject,
- node);
- else if ( ((MsgInfo*)(found_subject->data))->date_t >
- ((MsgInfo*)(node->data))->date_t ) {
- /* replace if msg in table is older than current one
- TODO: should create a list of messages with same subject */
- subject_table_remove_clean(subject_table, (gchar *) subject);
- subject_table_insert_clean(subject_table, (gchar *) subject, node);
- }
+ subject_relation_insert(subject_relation, node);
}
}
/* complete the unfinished threads */
for (node = root->children; node != NULL; ) {
- prev = node->prev; /* CLAWS: need the last node */
parent = NULL;
next = node->next;
msginfo = (MsgInfo *)node->data;
g_node_unlink(node);
g_node_insert_before
(parent, parent->children, node);
- /* CLAWS: ignore thread */
- if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, procmsg_ignore_node, NULL);
}
}
- last = (next == NULL) ? prev : node;
node = next;
}
if (prefs_common.thread_by_subject) {
- for (node = last; node && node != NULL;) {
- next = node->prev;
+ for (node = root->children; node && node != NULL;) {
+ next = node->next;
msginfo = (MsgInfo *) node->data;
- subject = msginfo->subject + subject_get_prefix_length(msginfo->subject);
- /* may not parentize if parent was delivered after childs */
- if (subject != msginfo->subject)
- parent = subject_table_lookup_clean(subject_table, (gchar *) subject);
- else
- parent = NULL;
+ parent = subject_relation_lookup(subject_relation, msginfo);
- /* the node may already be threaded by IN-REPLY-TO, so go up in the tree to
+ /* the node may already be threaded by IN-REPLY-TO, so go up
+ * in the tree to
find the parent node */
if (parent != NULL) {
if (g_node_is_ancestor(node, parent))
parent = NULL;
if (parent == node)
parent = NULL;
- /* make new thread parent if too old compared to previous one; probably
- breaks ignoring threads for subject threading. not accurate because
- the tree isn't sorted by date. */
- if (parent && abs(difftime(msginfo->date_t, ((MsgInfo *)parent->data)->date_t)) >
- prefs_common.thread_by_subject_max_age * 3600 * 24) {
- subject_table_remove_clean(subject_table, (gchar *) subject);
- subject_table_insert_clean(subject_table, (gchar *) subject, node);
- parent = NULL;
- }
}
if (parent) {
g_node_unlink(node);
g_node_append(parent, node);
- /* CLAWS: ignore thread */
- if (MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
- g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, procmsg_ignore_node, NULL);
- }
}
node = next;
}
}
- g_hash_table_destroy(subject_table);
+ g_relation_destroy(subject_relation);
g_hash_table_destroy(msgid_table);
return root;
} else if (dest == msginfo->to_folder) {
movelist = g_slist_append(movelist, msginfo);
} else {
- folder_item_move_msgs_with_dest(dest, movelist);
+ folder_item_move_msgs(dest, movelist);
g_slist_free(movelist);
movelist = NULL;
dest = msginfo->to_folder;
}
if (movelist) {
- folder_item_move_msgs_with_dest(dest, movelist);
+ folder_item_move_msgs(dest, movelist);
g_slist_free(movelist);
}
} else if (dest == msginfo->to_folder) {
copylist = g_slist_append(copylist, msginfo);
} else {
- folder_item_copy_msgs_with_dest(dest, copylist);
+ folder_item_copy_msgs(dest, copylist);
g_slist_free(copylist);
copylist = NULL;
dest = msginfo->to_folder;
}
if (copylist) {
- folder_item_copy_msgs_with_dest(dest, copylist);
+ folder_item_copy_msgs(dest, copylist);
g_slist_free(copylist);
}
filename = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
if (!filename)
- g_warning("can't fetch message %d\n", msginfo->msgnum);
+ debug_print("can't fetch message %d\n", msginfo->msgnum);
return filename;
}
+GSList *procmsg_get_message_file_list(GSList *mlist)
+{
+ GSList *file_list = NULL;
+ MsgInfo *msginfo;
+ MsgFileInfo *fileinfo;
+ gchar *file;
+
+ while (mlist != NULL) {
+ msginfo = (MsgInfo *)mlist->data;
+ file = procmsg_get_message_file(msginfo);
+ if (!file) {
+ procmsg_message_file_list_free(file_list);
+ return NULL;
+ }
+ fileinfo = g_new(MsgFileInfo, 1);
+ fileinfo->msginfo = procmsg_msginfo_new_ref(msginfo);
+ fileinfo->file = file;
+ fileinfo->flags = g_new(MsgFlags, 1);
+ *fileinfo->flags = msginfo->flags;
+ file_list = g_slist_prepend(file_list, fileinfo);
+ mlist = mlist->next;
+ }
+
+ file_list = g_slist_reverse(file_list);
+
+ return file_list;
+}
+
+void procmsg_message_file_list_free(MsgInfoList *file_list)
+{
+ GSList *cur;
+ MsgFileInfo *fileinfo;
+
+ for (cur = file_list; cur != NULL; cur = cur->next) {
+ fileinfo = (MsgFileInfo *)cur->data;
+ procmsg_msginfo_free(fileinfo->msginfo);
+ g_free(fileinfo->file);
+ g_free(fileinfo->flags);
+ g_free(fileinfo);
+ }
+
+ g_slist_free(file_list);
+}
+
FILE *procmsg_open_message(MsgInfo *msginfo)
{
FILE *fp;
if (!is_file_exist(file)) {
g_free(file);
file = procmsg_get_message_file(msginfo);
- g_return_val_if_fail(file != NULL, NULL);
+ if (!file)
+ return NULL;
}
if ((fp = fopen(file, "rb")) == NULL) {
return fp;
}
-#if USE_GPGME
-FILE *procmsg_open_message_decrypted(MsgInfo *msginfo, MimeInfo **mimeinfo)
-{
- FILE *fp;
- MimeInfo *mimeinfo_;
- glong fpos;
-
- g_return_val_if_fail(msginfo != NULL, NULL);
-
- if (mimeinfo) *mimeinfo = NULL;
-
- if ((fp = procmsg_open_message(msginfo)) == NULL) return NULL;
-
- mimeinfo_ = procmime_scan_mime_header(fp);
- if (!mimeinfo_) {
- fclose(fp);
- return NULL;
- }
-
- if (!MSG_IS_ENCRYPTED(msginfo->flags) &&
- rfc2015_is_encrypted(mimeinfo_)) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_ENCRYPTED);
- }
-
- if (MSG_IS_ENCRYPTED(msginfo->flags) &&
- !msginfo->plaintext_file &&
- !msginfo->decryption_failed) {
- fpos = ftell(fp);
- rfc2015_decrypt_message(msginfo, mimeinfo_, fp);
- if (msginfo->plaintext_file &&
- !msginfo->decryption_failed) {
- fclose(fp);
- procmime_mimeinfo_free_all(mimeinfo_);
- if ((fp = procmsg_open_message(msginfo)) == NULL)
- return NULL;
- mimeinfo_ = procmime_scan_mime_header(fp);
- if (!mimeinfo_) {
- fclose(fp);
- return NULL;
- }
- } else {
- if (fseek(fp, fpos, SEEK_SET) < 0)
- perror("fseek");
- }
- }
-
- if (mimeinfo) *mimeinfo = mimeinfo_;
- return fp;
-}
-#endif
-
gboolean procmsg_msg_exist(MsgInfo *msginfo)
{
gchar *path;
SET_FILTER_KEY("header \"List-Id\"", H_LIST_ID);
extract_list_id_str(*key);
} else if (hentry[H_X_SEQUENCE].body != NULL) {
- gchar *p;
+ guchar *p;
SET_FILTER_KEY("X-Sequence", H_X_SEQUENCE);
p = *key;
}
}
-void procmsg_empty_trash(void)
+void procmsg_empty_trash(FolderItem *trash)
+{
+ if (trash && trash->total_msgs > 0) {
+ GSList *mlist = folder_item_get_msg_list(trash);
+ GSList *cur;
+ for (cur = mlist ; cur != NULL ; cur = cur->next) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+ partial_mark_for_delete(msginfo);
+ procmsg_msginfo_free(msginfo);
+ }
+
+ folder_item_remove_all_msg(trash);
+ }
+}
+
+void procmsg_empty_all_trash(void)
{
FolderItem *trash;
GList *cur;
for (cur = folder_get_list(); cur != NULL; cur = cur->next) {
trash = FOLDER(cur->data)->trash;
- if (trash && trash->total_msgs > 0)
- folder_item_remove_all_msg(trash);
+ procmsg_empty_trash(trash);
}
}
*/
gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
{
- gint ret = 1, count = 0;
+ gint sent = 0, err = 0;
GSList *list, *elem;
if (!queue)
if (procmsg_send_message_queue(file) < 0) {
g_warning("Sending queued message %d failed.\n",
msginfo->msgnum);
- ret = -1;
+ err++;
} else {
/* CLAWS:
* We save in procmsg_send_message_queue because
(queue->folder->outbox,
file, TRUE);
*/
- count++;
+ sent++;
folder_item_remove_msg(queue, msginfo->msgnum);
}
g_free(file);
procmsg_msginfo_free(msginfo);
}
- return ret * count;
+ return (err != 0 ? -err : sent);
}
gint procmsg_remove_special_headers(const gchar *in, const gchar *out)
gboolean is_queued)
{
gint num;
- MsgInfo *msginfo;
+ MsgInfo *msginfo, *tmp_msginfo;
+ MsgFlags flag = {0, 0};
debug_print("saving sent message...\n");
gchar tmp[MAXPATHLEN + 1];
g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.out.%08x",
- get_rc_dir(), G_DIR_SEPARATOR, (guint)random());
+ get_rc_dir(), G_DIR_SEPARATOR, (guint) rand());
if (procmsg_remove_special_headers(file, tmp) !=0)
return -1;
folder_item_scan(outbox);
- if ((num = folder_item_add_msg(outbox, tmp, TRUE)) < 0) {
+ if ((num = folder_item_add_msg(outbox, tmp, &flag, TRUE)) < 0) {
g_warning("can't save message\n");
unlink(tmp);
return -1;
}
} else {
folder_item_scan(outbox);
- if ((num = folder_item_add_msg(outbox, file, FALSE)) < 0) {
+ if ((num = folder_item_add_msg
+ (outbox, file, &flag, FALSE)) < 0) {
g_warning("can't save message\n");
return -1;
}
return -1;
}
- msginfo = folder_item_get_msginfo(outbox, num);
+ msginfo = folder_item_get_msginfo(outbox, num); /* refcnt++ */
+ tmp_msginfo = procmsg_msginfo_get_full_info(msginfo); /* refcnt++ */
if (msginfo != NULL) {
- procmsg_msginfo_unset_flags(msginfo, ~0, 0);
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+ procmsg_msginfo_free(msginfo); /* refcnt-- */
+ /* tmp_msginfo == msginfo */
+ if (tmp_msginfo && (msginfo->dispositionnotificationto ||
+ msginfo->returnreceiptto)) {
+ procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0);
+ procmsg_msginfo_free(msginfo); /* refcnt-- */
+ }
}
- folder_item_update(outbox, TRUE);
return 0;
}
MEMBCOPY(size);
MEMBCOPY(mtime);
MEMBCOPY(date_t);
+
MEMBCOPY(flags);
MEMBDUP(fromname);
MEMBCOPY(score);
MEMBCOPY(threadscore);
+ MEMBDUP(plaintext_file);
return newmsginfo;
}
if (msginfo == NULL) return NULL;
- file = procmsg_get_message_file(msginfo);
- if (!file) {
+ file = procmsg_get_message_file_path(msginfo);
+ if (!file || !is_file_exist(file)) {
+ g_free(file);
+ file = procmsg_get_message_file(msginfo);
+ }
+ if (!file || !is_file_exist(file)) {
g_warning("procmsg_msginfo_get_full_info(): can't get message file.\n");
return NULL;
}
g_free(file);
if (!full_msginfo) return NULL;
- full_msginfo->msgnum = msginfo->msgnum;
- full_msginfo->size = msginfo->size;
- full_msginfo->mtime = msginfo->mtime;
- full_msginfo->folder = msginfo->folder;
-#if USE_GPGME
- full_msginfo->plaintext_file = g_strdup(msginfo->plaintext_file);
- full_msginfo->decryption_failed = msginfo->decryption_failed;
-#endif
- procmsg_msginfo_set_to_folder(full_msginfo, msginfo->to_folder);
-
- return full_msginfo;
+ /* CLAWS: make sure we add the missing members; see:
+ * procheader.c::procheader_get_headernames() */
+ if (!msginfo->xface)
+ msginfo->xface = g_strdup(full_msginfo->xface);
+ 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;
+ procmsg_msginfo_free(full_msginfo);
+
+ return procmsg_msginfo_new_ref(msginfo);
}
void procmsg_msginfo_free(MsgInfo *msginfo)
if (msginfo->refcnt > 0)
return;
- debug_print("freeing msginfo %d in %s\n", msginfo->msgnum, msginfo->folder ? msginfo->folder->path : "(nil)");
-
if (msginfo->to_folder) {
msginfo->to_folder->op_count--;
folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
g_free(msginfo->inreplyto);
g_free(msginfo->xref);
+ g_free(msginfo->partial_recv);
+ g_free(msginfo->account_server);
+ g_free(msginfo->account_login);
+
+ g_free(msginfo->plaintext_file);
+
g_free(msginfo);
}
Q_NEWS_ACCOUNT_ID = 5,
Q_SAVE_COPY_FOLDER = 6,
Q_REPLY_MESSAGE_ID = 7,
- Q_FWD_MESSAGE_ID = 8
+ Q_FWD_MESSAGE_ID = 8,
+ Q_PRIVACY_SYSTEM = 9,
+ Q_ENCRYPT = 10,
+ Q_ENCRYPT_DATA = 11,
};
gint procmsg_send_message_queue(const gchar *file)
{"SCF:", NULL, FALSE},
{"RMID:", NULL, FALSE},
{"FMID:", NULL, FALSE},
+ {"X-Sylpheed-Privacy-System:", NULL, FALSE},
+ {"X-Sylpheed-Encrypt:", NULL, FALSE},
+ {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
{NULL, NULL, FALSE}};
FILE *fp;
gint filepos;
gchar *savecopyfolder = NULL;
gchar *replymessageid = NULL;
gchar *fwdmessageid = NULL;
+ gchar *privacy_system = NULL;
+ gboolean encrypt = FALSE;
+ gchar *encrypt_data = NULL;
gchar buf[BUFFSIZE];
gint hnum;
PrefsAccount *mailac = NULL, *newsac = NULL;
+ gboolean save_clear_text = TRUE;
+ gchar *tmp_enc_file = NULL;
+
int local = 0;
g_return_val_if_fail(file != NULL, -1);
switch (hnum) {
case Q_SENDER:
- if (!from) from = g_strdup(p);
+ if (from == NULL)
+ from = g_strdup(p);
break;
case Q_SMTPSERVER:
- if (!smtpserver) smtpserver = g_strdup(p);
+ if (smtpserver == NULL)
+ smtpserver = g_strdup(p);
break;
case Q_RECIPIENTS:
to_list = address_list_append(to_list, p);
newsac = account_find_from_id(atoi(p));
break;
case Q_SAVE_COPY_FOLDER:
- if (!savecopyfolder) savecopyfolder = g_strdup(p);
+ if (savecopyfolder == NULL)
+ savecopyfolder = g_strdup(p);
break;
case Q_REPLY_MESSAGE_ID:
- if (!replymessageid) replymessageid = g_strdup(p);
+ if (replymessageid == NULL)
+ replymessageid = g_strdup(p);
break;
case Q_FWD_MESSAGE_ID:
- if (!fwdmessageid) fwdmessageid = g_strdup(p);
+ if (fwdmessageid == NULL)
+ fwdmessageid = g_strdup(p);
+ break;
+ case Q_PRIVACY_SYSTEM:
+ if (privacy_system == NULL)
+ privacy_system = g_strdup(p);
+ break;
+ case Q_ENCRYPT:
+ if (p[0] == '1')
+ encrypt = TRUE;
+ break;
+ case Q_ENCRYPT_DATA:
+ if (encrypt_data == NULL)
+ encrypt_data = g_strdup(p);
break;
}
}
filepos = ftell(fp);
+ if (encrypt) {
+ MimeInfo *mimeinfo;
+
+ save_clear_text = (mailac != NULL && mailac->save_encrypted_as_clear_text);
+
+ fclose(fp);
+ fp = NULL;
+
+ mimeinfo = procmime_scan_queue_file(file);
+ if (!privacy_encrypt(privacy_system, mimeinfo, encrypt_data)
+ || (fp = my_tmpfile()) == NULL
+ || procmime_write_mimeinfo(mimeinfo, fp) < 0) {
+ if (fp)
+ fclose(fp);
+ procmime_mimeinfo_free_all(mimeinfo);
+ g_free(from);
+ g_free(smtpserver);
+ slist_free_strings(to_list);
+ g_slist_free(to_list);
+ slist_free_strings(newsgroup_list);
+ g_slist_free(newsgroup_list);
+ g_free(savecopyfolder);
+ g_free(replymessageid);
+ g_free(fwdmessageid);
+ g_free(privacy_system);
+ g_free(encrypt_data);
+ return -1;
+ }
+
+ rewind(fp);
+ if (!save_clear_text) {
+ gchar *content = NULL;
+ FILE *tmpfp = get_tmpfile_in_dir(get_mime_tmp_dir(), &tmp_enc_file);
+ if (tmpfp) {
+ fclose(tmpfp);
+
+ content = file_read_stream_to_str(fp);
+ rewind(fp);
+
+ str_write_to_file(content, tmp_enc_file);
+ g_free(content);
+ } else {
+ g_warning("couldn't get tempfile\n");
+ }
+ }
+
+ procmime_mimeinfo_free_all(mimeinfo);
+
+ filepos = 0;
+ }
+
if (to_list) {
debug_print("Sending message by mail\n");
if (!from) {
mailac->mail_command && (* mailac->mail_command)) {
mailval = send_message_local(mailac->mail_command, fp);
local = 1;
- } else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
- mailval = send_message_local(prefs_common.extsend_cmd, fp);
- local = 1;
} else {
if (!mailac) {
mailac = account_find_from_smtp_server(from, smtpserver);
}
fseek(fp, filepos, SEEK_SET);
- if (newsgroup_list && (newsval == 0)) {
+ if (newsgroup_list && (mailval == 0)) {
Folder *folder;
gchar *tmp = NULL;
FILE *tmpfp;
g_free(tmp);
}
- slist_free_strings(to_list);
- g_slist_free(to_list);
- slist_free_strings(newsgroup_list);
- g_slist_free(newsgroup_list);
- g_free(from);
- g_free(smtpserver);
fclose(fp);
/* save message to outbox */
outbox = folder_find_item_from_identifier(savecopyfolder);
if (!outbox)
outbox = folder_get_default_outbox();
+
+ if (save_clear_text || tmp_enc_file == NULL) {
+ procmsg_save_to_outbox(outbox, file, TRUE);
+ } else {
+ procmsg_save_to_outbox(outbox, tmp_enc_file, FALSE);
+ }
+ }
- procmsg_save_to_outbox(outbox, file, TRUE);
+ if (tmp_enc_file != NULL) {
+ unlink(tmp_enc_file);
+ free(tmp_enc_file);
+ tmp_enc_file = NULL;
}
if (replymessageid != NULL || fwdmessageid != NULL) {
if (replymessageid != NULL) {
procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
- }
- else {
+ } else {
procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_FORWARDED, 0);
}
g_strfreev(tokens);
}
+ g_free(from);
+ g_free(smtpserver);
+ slist_free_strings(to_list);
+ g_slist_free(to_list);
+ slist_free_strings(newsgroup_list);
+ g_slist_free(newsgroup_list);
g_free(savecopyfolder);
g_free(replymessageid);
g_free(fwdmessageid);
-
+ g_free(privacy_system);
+ g_free(encrypt_data);
+
return (newsval != 0 ? newsval : mailval);
}
FolderItem *item;
MsgInfoUpdate msginfo_update;
MsgPermFlags perm_flags_new, perm_flags_old;
+ MsgTmpFlags tmp_flags_old;
g_return_if_fail(msginfo != NULL);
item = msginfo->folder;
update_folder_msg_counts(item, msginfo, perm_flags_old);
+ }
+
+ /* Tmp flags handling */
+ tmp_flags_old = msginfo->flags.tmp_flags;
+ msginfo->flags.tmp_flags |= tmp_flags;
+
+ /* update notification */
+ if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) {
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 */
- msginfo->flags.tmp_flags |= tmp_flags;
}
void procmsg_msginfo_unset_flags(MsgInfo *msginfo, MsgPermFlags perm_flags, MsgTmpFlags tmp_flags)
FolderItem *item;
MsgInfoUpdate msginfo_update;
MsgPermFlags perm_flags_new, perm_flags_old;
+ MsgTmpFlags tmp_flags_old;
g_return_if_fail(msginfo != NULL);
item = msginfo->folder;
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 */
+ tmp_flags_old = msginfo->flags.tmp_flags;
msginfo->flags.tmp_flags &= ~tmp_flags;
+
+ /* update notification */
+ if ((perm_flags_old != perm_flags_new) || (tmp_flags_old != msginfo->flags.tmp_flags)) {
+ 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);
+ }
}
/*!
return TRUE;
/* filter if enabled in prefs or move to inbox if not */
- if((global_processing != NULL) &&
- filter_message_by_msginfo(global_processing, msginfo))
+ if((filtering_rules != NULL) &&
+ filter_message_by_msginfo(filtering_rules, msginfo))
return TRUE;
return FALSE;
}
+
+MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimeinfo)
+{
+ MsgInfo *tmp_msginfo = NULL;
+ MsgFlags flags = {0, 0};
+
+
+ if (!mimeinfo || mimeinfo->type != MIMETYPE_MESSAGE ||
+ g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
+ g_warning("procmsg_msginfo_new_from_mimeinfo(): unsuitable mimeinfo");
+ return NULL;
+ }
+
+ if (mimeinfo->content == MIMECONTENT_MEM) {
+ gchar *tmpfile = get_tmp_file();
+ str_write_to_file(mimeinfo->data.mem, tmpfile);
+ g_free(mimeinfo->data.mem);
+ mimeinfo->content == MIMECONTENT_FILE;
+ mimeinfo->data.filename = g_strdup(tmpfile);
+ g_free(tmpfile);
+ }
+
+ tmp_msginfo = procheader_parse_file(mimeinfo->data.filename,
+ flags, TRUE, FALSE);
+
+ if (tmp_msginfo != NULL) {
+ tmp_msginfo->folder = src_msginfo->folder;
+ tmp_msginfo->plaintext_file = g_strdup(mimeinfo->data.filename);
+ } else {
+ g_warning("procmsg_msginfo_new_from_mimeinfo(): Can't generate new msginfo");
+ }
+
+ return tmp_msginfo;
+}
projects / claws.git / blobdiff