g_return_val_if_fail(item->folder != NULL, NULL);
type = item->folder->type;
- default_flags = MSG_NEW|MSG_UNREAD|MSG_CACHED;
+ default_flags.perm_flags = MSG_NEW|MSG_UNREAD;
+ default_flags.tmp_flags = MSG_CACHED;
if (type == F_MH) {
if (item->stype == F_QUEUE) {
- MSG_SET_FLAGS(default_flags, MSG_QUEUED);
+ MSG_SET_TMP_FLAGS(default_flags, MSG_QUEUED);
} else if (item->stype == F_DRAFT) {
- MSG_SET_FLAGS(default_flags, MSG_DRAFT);
+ MSG_SET_TMP_FLAGS(default_flags, MSG_DRAFT);
}
} else if (type == F_IMAP) {
- MSG_SET_FLAGS(default_flags, MSG_IMAP);
+ MSG_SET_TMP_FLAGS(default_flags, MSG_IMAP);
} else if (type == F_NEWS) {
- MSG_SET_FLAGS(default_flags, MSG_NEWS);
+ MSG_SET_TMP_FLAGS(default_flags, MSG_NEWS);
}
if (type == F_MH) {
setvbuf(fp, file_buf, _IOFBF, sizeof(file_buf));
g_free(cache_file);
- debug_print(_("\tReading summary cache..."));
+ debug_print(_("\tReading summary cache...\n"));
/* compare cache version */
if (fread(&ver, sizeof(ver), 1, fp) != 1 ||
READ_CACHE_DATA_INT(msginfo->size, fp);
READ_CACHE_DATA_INT(msginfo->mtime, fp);
READ_CACHE_DATA_INT(msginfo->date_t, fp);
- READ_CACHE_DATA_INT(msginfo->flags, fp);
+ READ_CACHE_DATA_INT(msginfo->flags.tmp_flags, fp);
READ_CACHE_DATA(msginfo->fromname, fp);
READ_CACHE_DATA(msginfo->inreplyto, fp);
READ_CACHE_DATA(msginfo->references, fp);
- MSG_SET_FLAGS(msginfo->flags, default_flags);
+ MSG_SET_PERM_FLAGS(msginfo->flags, default_flags.perm_flags);
+ MSG_SET_TMP_FLAGS(msginfo->flags, default_flags.tmp_flags);
/* if the message file doesn't exist or is changed,
don't add the data */
gchar *markdir;
MsgInfo *msginfo;
GHashTable *mark_table;
- MsgFlags flags;
+ MsgFlags *flags;
if (!mlist) return;
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- debug_print(_("\tMarking the messages..."));
+ debug_print(_("\tMarking the messages...\n"));
markdir = folder_item_get_path(item);
if (!is_dir_exist(markdir))
if (lastnum < msginfo->msgnum)
lastnum = msginfo->msgnum;
- flags = GPOINTER_TO_UINT(g_hash_table_lookup(mark_table,
- GUINT_TO_POINTER(msginfo->msgnum)));
+ flags = g_hash_table_lookup
+ (mark_table, GUINT_TO_POINTER(msginfo->msgnum));
- if (flags != 0) {
+ if (flags != NULL) {
/* add the permanent flags only */
- MSG_UNSET_FLAGS(msginfo->flags,
- MSG_PERMANENT_FLAG_MASK);
- MSG_SET_FLAGS(msginfo->flags,
- flags & MSG_PERMANENT_FLAG_MASK);
+ msginfo->flags.perm_flags = flags->perm_flags;
if (item->folder->type == F_IMAP) {
- MSG_SET_FLAGS(msginfo->flags, MSG_IMAP);
+ MSG_SET_TMP_FLAGS(msginfo->flags, MSG_IMAP);
} else if (item->folder->type == F_NEWS) {
- MSG_SET_FLAGS(msginfo->flags, MSG_NEWS);
+ MSG_SET_TMP_FLAGS(msginfo->flags, MSG_NEWS);
}
} else {
/* not found (new message) */
if (newmsg == 0) {
for (tmp = mlist; tmp != cur; tmp = tmp->next)
- MSG_UNSET_FLAGS
+ MSG_UNSET_PERM_FLAGS
(((MsgInfo *)tmp->data)->flags,
MSG_NEW);
}
if (newmsg)
debug_print(_("\t%d new message(s)\n"), newmsg);
+ hash_free_value_mem(mark_table);
g_hash_table_destroy(mark_table);
}
void procmsg_msg_list_free(GSList *mlist)
{
+ GSList *cur;
MsgInfo *msginfo;
- for (; mlist != NULL; mlist = mlist->next) {
- msginfo = (MsgInfo *)mlist->data;
+ for (cur = mlist; cur != NULL; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
procmsg_msginfo_free(msginfo);
}
g_slist_free(mlist);
void procmsg_write_cache(MsgInfo *msginfo, FILE *fp)
{
- MsgFlags flags = msginfo->flags & MSG_CACHED_FLAG_MASK;
+ MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
WRITE_CACHE_DATA_INT(msginfo->size, fp);
void procmsg_write_flags(MsgInfo *msginfo, FILE *fp)
{
- MsgFlags flags;
-
- flags = msginfo->flags & MSG_PERMANENT_FLAG_MASK;
+ MsgPermFlags flags = msginfo->flags.perm_flags;
WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
WRITE_CACHE_DATA_INT(flags, fp);
static void mark_sum_func(gpointer key, gpointer value, gpointer data)
{
- MsgFlags flags = GPOINTER_TO_UINT(value);
+ MsgFlags *flags = value;
struct MarkSum *marksum = data;
- if (MSG_IS_NEW(flags)) (*marksum->new)++;
- if (MSG_IS_UNREAD(flags)) (*marksum->unread)++;
+ if (MSG_IS_NEW(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->new)++;
+ if (MSG_IS_UNREAD(*flags) && !MSG_IS_IGNORE_THREAD(*flags)) (*marksum->unread)++;
(*marksum->total)++;
+
+ g_free(flags);
}
void procmsg_get_mark_sum(const gchar *folder,
FILE *fp;
GHashTable *mark_table = NULL;
gint num;
- MsgFlags flags;
+ MsgFlags *flags;
+ MsgPermFlags perm_flags;
if ((fp = procmsg_open_mark_file(folder, FALSE)) == NULL)
return NULL;
mark_table = g_hash_table_new(NULL, g_direct_equal);
while (fread(&num, sizeof(num), 1, fp) == 1) {
- if (fread(&flags, sizeof(flags), 1, fp) != 1) break;
- MSG_SET_FLAGS(flags, MSG_CACHED);
+ if (fread(&perm_flags, sizeof(flags), 1, fp) != 1) break;
+
+ flags = g_new0(MsgFlags, 1);
+ flags->perm_flags = perm_flags;
- g_hash_table_insert(mark_table,
- GUINT_TO_POINTER(num),
- GUINT_TO_POINTER(flags));
+ g_hash_table_insert(mark_table, GUINT_TO_POINTER(num), flags);
}
fclose(fp);
return fp;
}
+/* return the reversed thread tree */
+GNode *procmsg_get_thread_tree(GSList *mlist)
+{
+ GNode *root, *parent, *node, *next;
+ GHashTable *table;
+ MsgInfo *msginfo;
+ const gchar *msgid;
+
+ root = g_node_new(NULL);
+ table = g_hash_table_new(g_str_hash, g_str_equal);
+
+ for (; mlist != NULL; mlist = mlist->next) {
+ msginfo = (MsgInfo *)mlist->data;
+ parent = root;
+
+ if (msginfo->inreplyto) {
+ parent = g_hash_table_lookup(table, msginfo->inreplyto);
+ if (parent == NULL) {
+ parent = root;
+ } else {
+ if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+ }
+ }
+ }
+ node = g_node_insert_data_before
+ (parent, parent == root ? parent->children : NULL,
+ msginfo);
+ if ((msgid = msginfo->msgid) &&
+ g_hash_table_lookup(table, msgid) == NULL)
+ g_hash_table_insert(table, (gchar *)msgid, node);
+ }
+
+ /* complete the unfinished threads */
+ for (node = root->children; node != NULL; ) {
+ next = node->next;
+ msginfo = (MsgInfo *)node->data;
+ if (msginfo->inreplyto) {
+ parent = g_hash_table_lookup(table, msginfo->inreplyto);
+ if (parent && parent != node) {
+ g_node_unlink(node);
+ g_node_insert_before
+ (parent, parent->children, node);
+ if(MSG_IS_IGNORE_THREAD(((MsgInfo *)parent->data)->flags)) {
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+ }
+ }
+ }
+ node = next;
+ }
+
+ g_hash_table_destroy(table);
+
+ return root;
+}
+
void procmsg_move_messages(GSList *mlist)
{
GSList *cur, *movelist = NULL;
file = g_strdup(msginfo->plaintext_file);
else {
path = folder_item_get_path(msginfo->folder);
-
file = g_strconcat(path, G_DIR_SEPARATOR_S,
itos(msginfo->msgnum), NULL);
g_free(path);
if (!msginfo) return FALSE;
- path = procmsg_get_message_file_path(msginfo);
+ path = folder_item_get_path(msginfo->folder);
change_dir(path);
ret = !folder_item_is_msg_changed(msginfo->folder, msginfo);
g_free(path);
{
FolderItem *queue;
gint i;
+ gint ret = 0;
queue = folder_get_default_queue();
g_return_val_if_fail(queue != NULL, -1);
file = folder_item_fetch_msg(queue, i);
if (file) {
if (send_message_queue(file) < 0) {
- g_warning(_("Sending queued message failed.\n"));
- g_free(file);
- return -1;
- }
- folder_item_remove_msg(queue, i);
+ g_warning(_("Sending queued message %d failed.\n"), i);
+ ret = -1;
+ } else
+ folder_item_remove_msg(queue, i);
g_free(file);
}
}
- return 0;
+ return ret;
}
void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
g_return_if_fail(msginfo);
- if ((tmpfp = procmime_get_text_part(msginfo)) == NULL) {
+ if ((tmpfp = procmime_get_first_text_content(msginfo)) == NULL) {
g_warning(_("Can't get text part\n"));
return;
}
projects / claws.git / blobdiff