#include "utils.h"
#include "xml.h"
#include "codeconv.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "account.h"
#include "filtering.h"
#include "scoring.h"
#include "prefs_folder_item.h"
#include "procheader.h"
-#include "statusbar.h"
+#include "hooks.h"
+#include "log.h"
/* Dependecies to be removed ?! */
#include "prefs_common.h"
folder->item_new = NULL;
folder->item_destroy = NULL;
folder->fetch_msg = NULL;
- folder->fetch_msginfo = NULL;
- folder->fetch_msginfos = NULL;
+ folder->get_msginfo = NULL;
+ folder->get_msginfos = NULL;
folder->get_num_list = NULL;
folder->ui_func = NULL;
folder->ui_func_data = NULL;
item->mtime = 0;
item->new = 0;
item->unread = 0;
+ item->unreadmarked = 0;
item->total = 0;
item->last_num = -1;
item->cache = NULL;
item->no_sub = FALSE;
item->no_select = FALSE;
item->collapsed = FALSE;
+ item->thread_collapsed = FALSE;
item->threaded = TRUE;
item->ret_rcpt = FALSE;
item->opened = FALSE;
fputs("</folderlist>\n", pfile->fp);
- if (prefs_write_close(pfile) < 0)
+ if (prefs_file_close(pfile) < 0)
g_warning("failed to write folder list.\n");
}
{
guint new;
guint unread;
+ guint unreadmarked;
guint total;
};
count->new += item->new;
count->unread += item->unread;
+ count->unreadmarked += item->unreadmarked;
count->total += item->total;
}
-void folder_count_total_msgs(guint *new, guint *unread, guint *total)
+void folder_count_total_msgs(guint *new, guint *unread, guint *unreadmarked, guint *total)
{
struct TotalMsgCount count;
- count.new = count.unread = count.total = 0;
+ count.new = count.unread = count.unreadmarked = count.total = 0;
debug_print("Counting total number of messages...\n");
*new = count.new;
*unread = count.unread;
+ *unreadmarked = count.unreadmarked;
*total = count.total;
}
folder_item_write_cache(item);
- folder_update_item(item, FALSE);
-
+ folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
}
gint folder_item_scan(FolderItem *item)
{
Folder *folder;
GSList *folder_list = NULL, *cache_list = NULL, *folder_list_cur, *cache_list_cur, *new_list = NULL;
- guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+ guint newcnt = 0, unreadcnt = 0, totalcnt = 0, unreadmarkedcnt = 0;
guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
- gboolean contentchange = FALSE;
+ gboolean update_flags = 0;
g_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
else
folder_cur_num = G_MAXINT;
- contentchange = TRUE;
-
continue;
}
else
cache_cur_num = G_MAXINT;
- contentchange = TRUE;
+ update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
continue;
}
msgcache_remove_msg(item->cache, msginfo->msgnum);
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, item, folder_cur_num))) {
+ if (NULL != (newmsginfo = folder->get_msginfo(folder, item, folder_cur_num))) {
msgcache_add_msg(item->cache, newmsginfo);
if (MSG_IS_NEW(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
newcnt++;
if (MSG_IS_UNREAD(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
unreadcnt++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ unreadmarkedcnt++;
+ if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
procmsg_msginfo_free(newmsginfo);
}
newcnt++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
+ if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
}
totalcnt++;
procmsg_msginfo_free(msginfo);
else
folder_cur_num = G_MAXINT;
- contentchange = TRUE;
+ update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
continue;
}
g_slist_free(cache_list);
g_slist_free(folder_list);
- if (folder->fetch_msginfos) {
+ if (folder->get_msginfos) {
GSList *elem;
GSList *newmsg_list;
MsgInfo *msginfo;
if (new_list) {
- newmsg_list = folder->fetch_msginfos(folder, item, new_list);
+ newmsg_list = folder->get_msginfos(folder, item, new_list);
for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
msginfo = (MsgInfo *) elem->data;
msgcache_add_msg(item->cache, msginfo);
newcnt++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
+ if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
totalcnt++;
procmsg_msginfo_free(msginfo);
+
+ update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
}
g_slist_free(newmsg_list);
}
- } else if (folder->fetch_msginfo) {
+ } else if (folder->get_msginfo) {
GSList *elem;
for (elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
guint num;
num = GPOINTER_TO_INT(elem->data);
- msginfo = folder->fetch_msginfo(folder, item, num);
+ msginfo = folder->get_msginfo(folder, item, num);
if (msginfo != NULL) {
msgcache_add_msg(item->cache, msginfo);
if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
newcnt++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
unreadcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
+ if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
totalcnt++;
procmsg_msginfo_free(msginfo);
debug_print("Added newly found message %d to cache.\n", num);
}
+
+ update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
}
}
item->new = newcnt;
item->unread = unreadcnt;
item->total = totalcnt;
-
+ item->unreadmarked = unreadmarkedcnt;
g_slist_free(new_list);
- folder_update_item(item, contentchange);
+ folder_item_update(item, update_flags);
return 0;
}
g_free(mark_file);
}
-MsgInfo *folder_item_fetch_msginfo(FolderItem *item, gint num)
+MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
{
Folder *folder;
MsgInfo *msginfo;
if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
return msginfo;
- g_return_val_if_fail(folder->fetch_msginfo, NULL);
- if ((msginfo = folder->fetch_msginfo(folder, item, num)) != NULL) {
+ g_return_val_if_fail(folder->get_msginfo, NULL);
+ if ((msginfo = folder->get_msginfo(folder, item, num)) != NULL) {
msgcache_add_msg(item->cache, msginfo);
return msginfo;
}
return NULL;
}
-MsgInfo *folder_item_fetch_msginfo_by_id(FolderItem *item, const gchar *msgid)
+MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
{
Folder *folder;
MsgInfo *msginfo;
return folder->fetch_msg(folder, item, num);
}
+static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
+{
+ static HeaderEntry hentry[] = {{"Message-ID:", NULL, TRUE},
+ {NULL, NULL, FALSE}};
+ FILE *fp;
+ MsgInfo *msginfo;
+ gint msgnum = 0;
+ gchar buf[BUFFSIZE];
+
+ if ((fp = fopen(file, "rb")) == NULL)
+ return 0;
+
+ if ((dest->stype == F_QUEUE) || (dest->stype == F_DRAFT))
+ while (fgets(buf, sizeof(buf), fp) != NULL)
+ if (buf[0] == '\r' || buf[0] == '\n') break;
+
+ procheader_get_header_fields(fp, hentry);
+ if (hentry[0].body) {
+ extract_parenthesis(hentry[0].body, '<', '>');
+ remove_space(hentry[0].body);
+ if ((msginfo = msgcache_get_msg_by_id(dest->cache, hentry[0].body)) != NULL) {
+ msgnum = msginfo->msgnum;
+ procmsg_msginfo_free(msginfo);
+
+ debug_print("found message as uid %d\n", msgnum);
+ }
+ }
+
+ g_free(hentry[0].body);
+ hentry[0].body = NULL;
+ fclose(fp);
+
+ return msgnum;
+}
+
gint folder_item_add_msg(FolderItem *dest, const gchar *file,
gboolean remove_source)
{
if (!dest->cache)
folder_item_read_cache(dest);
- num = folder->add_msg(folder, dest, file, remove_source);
+ num = folder->add_msg(folder, dest, file, FALSE);
if (num > 0) {
- msginfo = folder->fetch_msginfo(folder, dest, num);
+ msginfo = folder->get_msginfo(folder, dest, num);
if (msginfo != NULL) {
if (MSG_IS_NEW(msginfo->flags))
dest->new++;
if (MSG_IS_UNREAD(msginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ dest->unreadmarked++;
+ if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
dest->total++;
- dest->need_update = TRUE;
msgcache_add_msg(dest->cache, msginfo);
-
procmsg_msginfo_free(msginfo);
+
+ folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
}
dest->last_num = num;
- }
+ } else if (num == 0) {
+ folder_item_scan(dest);
+ num = folder_item_get_msg_num_by_file(dest, file);
+ }
+
+ if (num >= 0 && remove_source) {
+ if (unlink(file) < 0)
+ FILE_OP_ERROR(file, "unlink");
+ }
return num;
}
FolderItem *next_item;
GNode *srcnode;
int cnt = 0;
+ gchar *old_id, *new_id;
+
mlist = folder_item_get_msg_list(src);
/* move messages */
return NULL;
}
- statusbar_print_all(_("Moving %s to %s..."), src->name, new_item->path);
-
if (new_item->folder == NULL)
new_item->folder = dest->folder;
MsgInfo * msginfo;
cnt++;
if (cnt%500)
- statusbar_print_all(_("Moving %s to %s (%d%%)..."), src->name,
+ log_message(_("Moving %s to %s (%d%%)...\n"), src->name,
new_item->path,
100*cnt/g_slist_length(mlist));
msginfo = (MsgInfo *) cur->data;
folder_item_move_msg(new_item, msginfo);
- if (cnt%500)
- statusbar_pop_all();
+
+ procmsg_msginfo_free(msginfo);
}
/*copy prefs*/
prefs_folder_item_copy_prefs(src, new_item);
new_item->collapsed = src->collapsed;
+ new_item->thread_collapsed = src->thread_collapsed;
new_item->threaded = src->threaded;
new_item->ret_rcpt = src->ret_rcpt;
new_item->hide_read_msgs = src->hide_read_msgs;
while (srcnode != NULL) {
if (srcnode && srcnode->data) {
next_item = (FolderItem*) srcnode->data;
+ srcnode = srcnode->next;
if (folder_item_move_recursive(next_item, new_item) == NULL)
return NULL;
}
- srcnode = srcnode->next;
}
+ old_id = folder_item_get_identifier(src);
+ new_id = folder_item_get_identifier(new_item);
+ debug_print("updating rules : %s => %s\n", old_id, new_id);
+
+ src->folder->remove_folder(src->folder, src);
+ folder_write_list();
+
+ if (old_id != NULL && new_id != NULL)
+ prefs_filtering_rename_path(old_id, new_id);
+ g_free(old_id);
+ g_free(new_id);
+
return new_item;
}
-FolderItem *folder_item_move_to(FolderItem *src, FolderItem *dest)
+gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
{
FolderItem *tmp = dest->parent;
- char * src_identifier, * dst_identifier, * new_identifier;
- char * phys_srcpath, * phys_dstpath;
+ gchar * src_identifier, * dst_identifier;
+ gchar * phys_srcpath, * phys_dstpath;
GNode *src_node;
while (tmp) {
if (tmp == src) {
- alertpanel_error(_("Can't move a folder to one of its children."));
- return NULL;
+ return F_MOVE_FAILED_DEST_IS_CHILD;
}
tmp = tmp->parent;
}
}
if (src_identifier == NULL || dst_identifier == NULL) {
printf("Can't get identifiers\n");
- return NULL;
+ return F_MOVE_FAILED;
+ }
+
+ if (src->folder != dest->folder) {
+ return F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX;
}
phys_srcpath = folder_item_get_path(src);
phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
- if (src->parent == dest) {
- alertpanel_error(_("Source and destination are the same."));
+ if (src->parent == dest || src == dest) {
g_free(src_identifier);
g_free(dst_identifier);
g_free(phys_srcpath);
g_free(phys_dstpath);
- return NULL;
+ return F_MOVE_FAILED_DEST_IS_PARENT;
}
debug_print("moving \"%s\" to \"%s\"\n", phys_srcpath, phys_dstpath);
if ((tmp = folder_item_move_recursive(src, dest)) == NULL) {
- alertpanel_error(_("Move failed!"));
- return NULL;
+ return F_MOVE_FAILED;
}
/* update rules */
- src->folder->remove_folder(src->folder, src);
src_node = g_node_find(src->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, src);
if (src_node)
g_node_destroy(src_node);
debug_print("can't remove node: it's null!\n");
/* not to much worry if remove fails, move has been done */
- debug_print("updating rules ....\n");
- new_identifier = g_strconcat(dst_identifier, G_DIR_SEPARATOR_S, g_basename(phys_srcpath), NULL);
- prefs_filtering_rename_path(src_identifier, new_identifier);
-
- folder_write_list();
-
g_free(src_identifier);
g_free(dst_identifier);
- g_free(new_identifier);
g_free(phys_srcpath);
g_free(phys_dstpath);
- return tmp;
+ *new_item = tmp;
+
+ return F_MOVE_OK;
}
gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
num = folder->copy_msg(folder, dest, msginfo);
- if (num != -1) {
+ if (num > 0) {
MsgInfo *newmsginfo;
/* Add new msginfo to dest folder */
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+ if (NULL != (newmsginfo = folder->get_msginfo(folder, dest, num))) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX || dest->stype == F_QUEUE ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
+ if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
dest->total++;
- dest->need_update = TRUE;
+ folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
procmsg_msginfo_free(newmsginfo);
}
msginfo->msgnum);
msgcache_remove_msg(msginfo->folder->cache, msginfo->msgnum);
- if (MSG_IS_NEW(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
msginfo->folder->new--;
- if (MSG_IS_UNREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
msginfo->folder->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ msginfo->folder->unreadmarked--;
msginfo->folder->total--;
- msginfo->folder->need_update = TRUE;
+ folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
}
}
num = GPOINTER_TO_INT(l2->data);
- if (num != -1) {
+ if (num > 0) {
MsgInfo *newmsginfo;
- newmsginfo = folder->fetch_msginfo(folder, dest, num);
+ newmsginfo = folder->get_msginfo(folder, dest, num);
if (newmsginfo) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
+ if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
dest->total++;
- dest->need_update = TRUE;
+ folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
procmsg_msginfo_free(newmsginfo);
}
num = GPOINTER_TO_INT(l2->data);
- if (num != -1) {
+ if (num > 0) {
item->folder->remove_msg(item->folder,
msginfo->folder,
msginfo->msgnum);
folder_item_read_cache(item);
msgcache_remove_msg(item->cache, msginfo->msgnum);
- if (MSG_IS_NEW(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
msginfo->folder->new--;
- if (MSG_IS_UNREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
msginfo->folder->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ msginfo->folder->unreadmarked--;
msginfo->folder->total--;
- msginfo->folder->need_update = TRUE;
+ folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
}
l2 = g_slist_next(l2);
if (!dest->cache) folder_item_read_cache(dest);
num = folder->copy_msg(folder, dest, msginfo);
- if (num != -1) {
+ if (num > 0) {
MsgInfo *newmsginfo;
- if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+ if (NULL != (newmsginfo = folder->get_msginfo(folder, dest, num))) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->stype == F_QUEUE ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
+ if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
dest->total++;
- dest->need_update = TRUE;
+ folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
procmsg_msginfo_free(newmsginfo);
}
num = GPOINTER_TO_INT(l2->data);
- if (num != -1) {
+ if (num > 0) {
MsgInfo *newmsginfo;
- newmsginfo = folder->fetch_msginfo(folder, dest, num);
+ newmsginfo = folder->get_msginfo(folder, dest, num);
if (newmsginfo) {
newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
if (dest->stype == F_OUTBOX ||
dest->new++;
if (MSG_IS_UNREAD(newmsginfo->flags))
dest->unread++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ dest->unreadmarked++;
+ if (procmsg_msg_has_flagged_parent(newmsginfo, MSG_IGNORE_THREAD))
+ procmsg_msginfo_set_flags(newmsginfo, MSG_IGNORE_THREAD, 0);
dest->total++;
- dest->need_update = TRUE;
+ folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
procmsg_msginfo_free(newmsginfo);
}
msginfo = msgcache_get_msg(item->cache, num);
if (msginfo != NULL) {
- if (MSG_IS_NEW(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
item->new--;
- if (MSG_IS_UNREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
item->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ item->unreadmarked--;
procmsg_msginfo_free(msginfo);
msgcache_remove_msg(item->cache, num);
}
item->total--;
- item->need_update = TRUE;
+ folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
return ret;
}
Folder *folder;
gint ret = 0;
+ g_return_val_if_fail(item != NULL, -1);
folder = item->folder;
+ g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(item != NULL, -1);
-
if (!item->cache) folder_item_read_cache(item);
if (folder->remove_msgs) {
item->new = 0;
item->unread = 0;
+ item->unreadmarked = 0;
item->total = 0;
- item->need_update = TRUE;
+ folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
}
return result;
PrefsAccount *account = NULL;
gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE,
threaded = TRUE, apply_sub = FALSE;
- gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE; /* CLAWS */
+ gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE,
+ thread_collapsed = FALSE; /* CLAWS */
FolderSortKey sort_key = SORT_BY_NONE;
FolderSortType sort_type = SORT_ASCENDING;
- gint new = 0, unread = 0, total = 0;
+ gint new = 0, unread = 0, total = 0, unreadmarked = 0;
time_t mtime = 0;
g_return_val_if_fail(node->data != NULL, FALSE);
new = atoi(attr->value);
else if (!strcmp(attr->name, "unread"))
unread = atoi(attr->value);
+ else if (!strcmp(attr->name, "unreadmarked"))
+ unreadmarked = atoi(attr->value);
else if (!strcmp(attr->name, "total"))
total = atoi(attr->value);
else if (!strcmp(attr->name, "no_sub"))
no_select = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "collapsed"))
collapsed = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "thread_collapsed"))
+ thread_collapsed = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "threaded"))
threaded = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "hidereadmsgs"))
else if (!strcmp(attr->value, "mark"))
sort_key = SORT_BY_MARK;
else if (!strcmp(attr->value, "unread"))
- sort_key = SORT_BY_UNREAD;
+ sort_key = SORT_BY_STATUS;
else if (!strcmp(attr->value, "mime"))
sort_key = SORT_BY_MIME;
+ else if (!strcmp(attr->value, "to"))
+ sort_key = SORT_BY_TO;
else if (!strcmp(attr->value, "locked"))
sort_key = SORT_BY_LOCKED;
} else if (!strcmp(attr->name, "sort_type")) {
item->mtime = mtime;
item->new = new;
item->unread = unread;
+ item->unreadmarked = unreadmarked;
item->total = total;
item->no_sub = no_sub;
item->no_select = no_select;
item->collapsed = collapsed;
+ item->thread_collapsed = thread_collapsed;
item->threaded = threaded;
item->hide_read_msgs = hidereadmsgs;
item->ret_rcpt = ret_rcpt;
const gchar *path = NULL;
PrefsAccount *account = NULL;
gboolean collapsed = FALSE, threaded = TRUE, apply_sub = FALSE;
- gboolean ret_rcpt = FALSE; /* CLAWS */
+ gboolean ret_rcpt = FALSE, thread_collapsed = FALSE; /* CLAWS */
if (g_node_depth(node) != 2) return FALSE;
g_return_val_if_fail(node->data != NULL, FALSE);
path = attr->value;
else if (!strcmp(attr->name, "collapsed"))
collapsed = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "thread_collapsed"))
+ thread_collapsed = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "threaded"))
threaded = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "account_id")) {
folder->node = node;
folder_add(folder);
FOLDER_ITEM(node->data)->collapsed = collapsed;
+ FOLDER_ITEM(node->data)->thread_collapsed = thread_collapsed;
FOLDER_ITEM(node->data)->threaded = threaded;
FOLDER_ITEM(node->data)->account = account;
FOLDER_ITEM(node->data)->apply_sub = apply_sub;
"draft", "queue", "trash"};
static gchar *sort_key_str[] = {"none", "number", "size", "date",
"from", "subject", "score", "label",
- "mark", "unread", "mime", "locked" };
+ "mark", "unread", "mime", "to",
+ "locked"};
g_return_if_fail(node != NULL);
g_return_if_fail(fp != NULL);
fputs(" no_select=\"1\"", fp);
if (item->collapsed && node->children)
fputs(" collapsed=\"1\"", fp);
+ else
+ fputs(" collapsed=\"0\"", fp);
+ if (item->thread_collapsed)
+ fputs(" thread_collapsed=\"1\"", fp);
+ else
+ fputs(" thread_collapsed=\"0\"", fp);
if (item->threaded)
fputs(" threaded=\"1\"", fp);
else
}
fprintf(fp,
- " mtime=\"%lu\" new=\"%d\" unread=\"%d\" total=\"%d\"",
- item->mtime, item->new, item->unread, item->total);
+ " mtime=\"%lu\" new=\"%d\" unread=\"%d\" unreadmarked=\"%d\" total=\"%d\"",
+ item->mtime, item->new, item->unread, item->unreadmarked, item->total);
if (item->account)
fprintf(fp, " account_id=\"%d\"",
if (g_node_depth(node) > 0) {
if (fitem->op_count > 0) {
fitem->op_count = 0;
- folder_update_item(fitem, FALSE);
+ folder_item_update(fitem, F_ITEM_UPDATE_MSGCNT);
}
if (node->children) {
GNode *child;
prefs_folder_item_read_config(item);
item->collapsed = pp->collapsed;
+ item->thread_collapsed = pp->thread_collapsed;
item->threaded = pp->threaded;
item->ret_rcpt = pp->ret_rcpt;
item->hide_read_msgs = pp->hide_read_msgs;
pp = g_new0(PersistPrefs, 1);
g_return_if_fail(pp != NULL);
pp->collapsed = item->collapsed;
+ pp->thread_collapsed = item->thread_collapsed;
pp->threaded = item->threaded;
pp->ret_rcpt = item->ret_rcpt;
pp->hide_read_msgs = item->hide_read_msgs;
if (processing_list == NULL)
return;
+ folder_item_update_freeze();
+
mlist = folder_item_get_msg_list(item);
-
for (cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo;
filter_message_by_msginfo(processing_list, msginfo);
procmsg_msginfo_free(msginfo);
}
-
- folder_update_items_when_required(FALSE);
-
g_slist_free(mlist);
+
+ folder_item_update_thaw();
}
/*
- * Callback handling for FolderItem content changes
+ * functions for handling FolderItem content changes
*/
-GSList *folder_item_update_callbacks_list = NULL;
-gint folder_item_update_callbacks_nextid = 0;
-
-struct FolderItemUpdateCallback
-{
- gint id;
- FolderItemUpdateFunc func;
- gpointer data;
-};
+static gint folder_item_update_freeze_cnt = 0;
-gint folder_item_update_callback_register(FolderItemUpdateFunc func, gpointer data)
+/**
+ * Notify the folder system about changes to a folder. If the
+ * update system is not frozen the FOLDER_ITEM_UPDATE_HOOKLIST will
+ * be invoked, otherwise the changes will be remebered until
+ * the folder system is thawed.
+ *
+ * \param item The FolderItem that was changed
+ * \param update_flags Type of changed that was made
+ */
+void folder_item_update(FolderItem *item, FolderItemUpdateFlags update_flags)
{
- struct FolderItemUpdateCallback *callback;
-
- g_return_val_if_fail(func != NULL, -1);
-
- folder_item_update_callbacks_nextid++;
-
- callback = g_new0(struct FolderItemUpdateCallback, 1);
- callback->id = folder_item_update_callbacks_nextid;
- callback->func = func;
- callback->data = data;
-
- folder_item_update_callbacks_list =
- g_slist_append(folder_item_update_callbacks_list, callback);
-
- return folder_item_update_callbacks_nextid;
+ if (folder_item_update_freeze_cnt == 0) {
+ FolderItemUpdateData source;
+
+ source.item = item;
+ source.update_flags = update_flags;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+ } else {
+ item->update_flags |= update_flags;
+ }
}
-void folder_item_update_callback_unregister(gint id)
+void folder_item_update_recursive(FolderItem *item, FolderItemUpdateFlags update_flags)
{
- GSList *list, *next;
+ GNode *node = item->folder->node;
- for (list = folder_item_update_callbacks_list; list != NULL; list = next) {
- struct FolderItemUpdateCallback *callback;
+ node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ node = node->children;
- next = list->next;
+ folder_item_update(item, update_flags);
+ while (node != NULL) {
+ if (node && node->data) {
+ FolderItem *next_item = (FolderItem*) node->data;
- callback = list->data;
- if (callback->id == id) {
- folder_item_update_callbacks_list =
- g_slist_remove(folder_item_update_callbacks_list, callback);
- g_free(callback);
+ folder_item_update(next_item, update_flags);
}
+ node = node->next;
}
}
-static void folder_item_update_callback_execute(FolderItem *item, gboolean contentchange)
-{
- GSList *list;
-
- for (list = folder_item_update_callbacks_list; list != NULL; list = list->next) {
- struct FolderItemUpdateCallback *callback;
-
- callback = list->data;
- callback->func(item, contentchange, callback->data);
- }
-}
-
-void folder_update_item(FolderItem *item, gboolean contentchange)
+void folder_item_update_freeze()
{
- folder_item_update_callback_execute(item, contentchange);
+ folder_item_update_freeze_cnt++;
}
-static void folder_update_item_func(FolderItem *item, gpointer contentchange)
+static void folder_item_update_func(FolderItem *item, gpointer data)
{
- if (item->need_update) {
- folder_item_update_callback_execute(item, GPOINTER_TO_INT(contentchange));
- item->need_update = FALSE;
+ FolderItemUpdateData source;
+
+ if (item->update_flags) {
+ source.item = item;
+ source.update_flags = item->update_flags;
+ hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
+ item->update_flags = 0;
}
}
-void folder_update_items_when_required(gboolean contentchange)
-{
- folder_func_to_all_folders(folder_update_item_func, GINT_TO_POINTER(contentchange));
-}
-
-void folder_update_item_recursive(FolderItem *item, gboolean update_summary)
+void folder_item_update_thaw()
{
- GNode *node = item->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
- node = node->children;
- folder_item_update_callback_execute(item, update_summary);
- while (node != NULL) {
- if (node && node->data) {
- FolderItem *next_item = (FolderItem*) node->data;
- folder_item_update_callback_execute(next_item, update_summary);
- }
- node = node->next;
+ if (folder_item_update_freeze_cnt > 0)
+ folder_item_update_freeze_cnt--;
+ if (folder_item_update_freeze_cnt == 0) {
+ /* Update all folders */
+ folder_func_to_all_folders(folder_item_update_func, NULL);
}
}
projects / claws.git / blobdiff