#endif
#include "alertpanel.h"
#include "news.h"
+#include "imap.h"
typedef struct _FlagInfo FlagInfo;
MsgFlags flags;
};
-static void mark_sum_func (gpointer key,
- gpointer value,
- gpointer data);
-
static GHashTable *procmsg_read_mark_file (const gchar *folder);
-static gint procmsg_cmp_msgnum (gconstpointer a,
- gconstpointer b);
-static gint procmsg_cmp_flag_msgnum (gconstpointer a,
- gconstpointer b);
+void procmsg_msginfo_write_flags (MsgInfo *msginfo);
GHashTable *procmsg_msg_hash_table_create(GSList *mlist)
}
cache_file = folder_item_get_cache_file(item);
if ((fp = fopen(cache_file, "rb")) == NULL) {
- debug_print(_("\tNo cache file\n"));
+ debug_print("\tNo cache file\n");
g_free(cache_file);
return NULL;
}
setvbuf(fp, file_buf, _IOFBF, sizeof(file_buf));
g_free(cache_file);
- debug_print(_("\tReading summary cache...\n"));
+ debug_print("\tReading summary cache...\n");
/* compare cache version */
if (fread(&ver, sizeof(ver), 1, fp) != 1 ||
CACHE_VERSION != ver) {
- debug_print(_("Cache version is different. Discarding it.\n"));
+ debug_print("Cache version is different. Discarding it.\n");
fclose(fp);
return NULL;
}
}
fclose(fp);
- debug_print(_("done.\n"));
+ debug_print("done.\n");
return mlist;
}
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- debug_print(_("\tMarking the messages...\n"));
+ debug_print("\tMarking the messages...\n");
markdir = folder_item_get_path(item);
if (!is_dir_exist(markdir))
item->last_num = lastnum;
- debug_print(_("done.\n"));
+ debug_print("done.\n");
if (newmsg)
- debug_print(_("\t%d new message(s)\n"), newmsg);
+ debug_print("\t%d new message(s)\n", newmsg);
hash_free_value_mem(mark_table);
g_hash_table_destroy(mark_table);
}
-gint procmsg_get_last_num_in_cache(GSList *mlist)
+gint procmsg_get_last_num_in_msg_list(GSList *mlist)
{
GSList *cur;
MsgInfo *msginfo;
gint last = 0;
- if (mlist == NULL) return 0;
-
for (cur = mlist; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
if (msginfo && msginfo->msgnum > last)
gint first;
};
-static void mark_sum_func(gpointer key, gpointer value, gpointer data)
-{
- MsgFlags *flags = value;
- gint num = GPOINTER_TO_INT(key);
- struct MarkSum *marksum = data;
-
- if (marksum->first <= num) {
- if (MSG_IS_NEW(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->new)++;
- if (MSG_IS_UNREAD(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->unread)++;
- if (num > *marksum->max) *marksum->max = num;
- if (num < *marksum->min || *marksum->min == 0) *marksum->min = num;
- (*marksum->total)++;
- }
-
- g_free(flags);
-}
-
-void procmsg_get_mark_sum(const gchar *folder,
- gint *new, gint *unread, gint *total,
- gint *min, gint *max,
- gint first)
-{
- GHashTable *mark_table;
- struct MarkSum marksum;
-
- *new = *unread = *total = *min = *max = 0;
- marksum.new = new;
- marksum.unread = unread;
- marksum.total = total;
- marksum.min = min;
- marksum.max = max;
- marksum.first = first;
-
- mark_table = procmsg_read_mark_file(folder);
-
- if (mark_table) {
- g_hash_table_foreach(mark_table, mark_sum_func, &marksum);
- g_hash_table_destroy(mark_table);
- }
- debug_print("mark->new = %d, mark->unread = %d, mark->total = %d\n",
- *(marksum.new), *(marksum.unread), *(marksum.total));
-}
-
static GHashTable *procmsg_read_mark_file(const gchar *folder)
{
FILE *fp;
while (fread(&num, sizeof(num), 1, fp) == 1) {
if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
+ flags = g_hash_table_lookup(mark_table, GUINT_TO_POINTER(num));
+ if (flags != NULL)
+ g_free(flags);
+
flags = g_new0(MsgFlags, 1);
flags->perm_flags = perm_flags;
markfile = g_strconcat(folder, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
if ((fp = fopen(markfile, "rb")) == NULL)
- debug_print(_("Mark file not found.\n"));
+ debug_print("Mark file not found.\n");
else if (fread(&ver, sizeof(ver), 1, fp) != 1 || MARK_VERSION != ver) {
- debug_print(_("Mark version is different (%d != %d). "
- "Discarding it.\n"), ver, MARK_VERSION);
+ debug_print("Mark version is different (%d != %d). "
+ "Discarding it.\n", ver, MARK_VERSION);
fclose(fp);
fp = NULL;
}
return fp;
}
+static gboolean procmsg_ignore_node(GNode *node, gpointer data)
+{
+ MsgInfo *msginfo = (MsgInfo *)node->data;
+
+ procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+
+ return FALSE;
+}
+
/* return the reversed thread tree */
GNode *procmsg_get_thread_tree(GSList *mlist)
{
MsgInfo *msginfo;
const gchar *msgid;
const gchar *subject;
+ GNode *found_subject;
root = g_node_new(NULL);
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
if (parent == NULL) {
parent = root;
} else {
- if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
+ if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
}
}
g_hash_table_insert(msgid_table, (gchar *)msgid, node);
subject = msginfo->subject;
- if (subject_table_lookup(subject_table,
- (gchar *) subject) == NULL)
- subject_table_insert(subject_table, (gchar *)subject,
+ found_subject = subject_table_lookup(subject_table,
+ (gchar *) subject);
+ if (found_subject == NULL)
+ subject_table_insert(subject_table, (gchar *) subject,
node);
+ else {
+ /* replace if msg in table is older than current one
+ * can add here more stuff. */
+ if ( ((MsgInfo*)(found_subject->data))->date_t >
+ ((MsgInfo*)(node->data))->date_t ) {
+ subject_table_remove(subject_table, (gchar *) subject);
+ subject_table_insert(subject_table, (gchar *) subject, node);
+ }
+ }
}
/* complete the unfinished threads */
g_node_insert_before
(parent, parent->children, node);
/* CLAWS: ignore thread */
- if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
- procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+ 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_node_unlink(node);
g_node_append(parent, node);
/* CLAWS: ignore thread */
- if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
- procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+ 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_hash_table_destroy(msgid_table);
GSList *cur, *movelist = NULL;
MsgInfo *msginfo;
FolderItem *dest = NULL;
- GHashTable *hash;
if (!mlist) return;
GSList *cur, *copylist = NULL;
MsgInfo *msginfo;
FolderItem *dest = NULL;
- GHashTable *hash;
if (!mlist) return;
gint procmsg_send_queue(FolderItem *queue, gboolean save_msgs)
{
- gint i;
gint ret = 0;
GSList *list, *elem;
{
gint num;
FILE *fp;
- MsgFlags flag = {0, 0};
MsgInfo *msginfo;
- debug_print(_("saving sent message...\n"));
+ debug_print("saving sent message...\n");
if (!outbox)
outbox = folder_get_default_outbox();
fputs(buf, outfp);
fclose(outfp);
fclose(fp);
- Xstrdup_a(file, tmp, return -1);
- }
- if ((num = folder_item_add_msg(outbox, file, FALSE)) < 0) {
- g_warning(_("can't save message\n"));
- if(is_queued) {
- unlink(file);
+ folder_item_scan(outbox);
+ if ((num = folder_item_add_msg(outbox, tmp, 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) {
+ g_warning("can't save message\n");
+ return -1;
}
return -1;
}
msginfo = folder_item_fetch_msginfo(outbox, num);
- procmsg_msginfo_unset_flags(msginfo, ~0, ~0);
- procmsg_msginfo_free(msginfo);
+ if(msginfo != NULL) {
+ procmsg_msginfo_unset_flags(msginfo, ~0, ~0);
+ procmsg_msginfo_free(msginfo);
+ }
if(is_queued) {
unlink(file);
return memusage;
}
-static gint procmsg_cmp_msgnum(gconstpointer a, gconstpointer b)
-{
- const MsgInfo *msginfo = a;
- const guint msgnum = GPOINTER_TO_UINT(b);
-
- if (!msginfo)
- return -1;
-
- return msginfo->msgnum - msgnum;
-}
-
gint procmsg_cmp_msgnum_for_sort(gconstpointer a, gconstpointer b)
{
const MsgInfo *msginfo1 = a;
return msginfo1->msgnum - msginfo2->msgnum;
}
-static gint procmsg_cmp_flag_msgnum(gconstpointer a, gconstpointer b)
-{
- const FlagInfo *finfo = a;
- const guint msgnum = GPOINTER_TO_UINT(b);
-
- if (!finfo)
- return -1;
-
- return finfo->msgnum - msgnum;
-}
-
enum
{
Q_SENDER = 0,
Q_NEWSGROUPS = 3,
Q_MAIL_ACCOUNT_ID = 4,
Q_NEWS_ACCOUNT_ID = 5,
- Q_SAVE_COPY_FOLDER = 6
+ Q_SAVE_COPY_FOLDER = 6,
+ Q_REPLY_MESSAGE_ID = 7,
};
gint procmsg_send_message_queue(const gchar *file)
{"MAID:", NULL, FALSE},
{"NAID:", NULL, FALSE},
{"SCF:", NULL, FALSE},
+ {"RMID:", NULL, FALSE},
{NULL, NULL, FALSE}};
FILE *fp;
gint filepos;
GSList *to_list = NULL;
GSList *newsgroup_list = NULL;
gchar *savecopyfolder = NULL;
+ gchar *replymessageid = NULL;
gchar buf[BUFFSIZE];
gint hnum;
PrefsAccount *mailac = NULL, *newsac = NULL;
case Q_SAVE_COPY_FOLDER:
if (!savecopyfolder) savecopyfolder = g_strdup(p);
break;
+ case Q_REPLY_MESSAGE_ID:
+ if (!replymessageid) replymessageid = g_strdup(p);
+ break;
}
}
filepos = ftell(fp);
fseek(fp, filepos, SEEK_SET);
if (to_list) {
- debug_print(_("Sending message by mail\n"));
+ debug_print("Sending message by mail\n");
if(!from) {
g_warning(_("Queued message header is broken.\n"));
mailval = -1;
fclose(tmpfp);
if(newsval == 0) {
- debug_print(_("Sending message by news\n"));
+ debug_print("Sending message by news\n");
folder = FOLDER(newsac->folder);
if (mailval == 0 && newsval == 0 && savecopyfolder) {
FolderItem *outbox;
- debug_print(_("saving sent message...\n"));
+ debug_print("saving sent message...\n");
outbox = folder_find_item_from_identifier(savecopyfolder);
if(!outbox)
procmsg_save_to_outbox(outbox, file, TRUE);
}
+ if(replymessageid != NULL) {
+ gchar **tokens;
+ FolderItem *item;
+
+ tokens = g_strsplit(replymessageid, "\x7f", 0);
+ item = folder_find_item_from_identifier(tokens[0]);
+ if(item != NULL) {
+ MsgInfo *msginfo;
+
+ msginfo = folder_item_fetch_msginfo(item, atoi(tokens[1]));
+ if((msginfo != NULL) && (strcmp(msginfo->msgid, tokens[2]) != 0)) {
+ procmsg_msginfo_free(msginfo);
+ msginfo = NULL;
+ }
+
+ if(msginfo == NULL) {
+ msginfo = folder_item_fetch_msginfo_by_id(item, tokens[2]);
+ }
+
+ if(msginfo != NULL) {
+ procmsg_msginfo_unset_flags(msginfo, MSG_FORWARDED, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_REPLIED, 0);
+
+ procmsg_msginfo_free(msginfo);
+ }
+ }
+ g_strfreev(tokens);
+ }
+
+ g_free(savecopyfolder);
+ g_free(replymessageid);
+
return (newsval != 0 ? newsval : mailval);
}
gboolean changed = FALSE;
FolderItem *item = msginfo->folder;
- debug_print(_("Setting flags for message %d in folder %s\n"), msginfo->msgnum, item->path);
+ debug_print("Setting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
/* if new flag is set */
if((perm_flags & MSG_NEW) && !MSG_IS_NEW(msginfo->flags) &&
gboolean changed = FALSE;
FolderItem *item = msginfo->folder;
- debug_print(_("Unsetting flags for message %d in folder %s\n"), msginfo->msgnum, item->path);
+ debug_print("Unsetting flags for message %d in folder %s\n", msginfo->msgnum, item->path);
/* if new flag is unset */
if((perm_flags & MSG_NEW) && MSG_IS_NEW(msginfo->flags) &&
projects / claws.git / blobdiff