static gboolean persist_prefs_free (gpointer key, gpointer val, gpointer data);
void folder_item_read_cache (FolderItem *item);
void folder_item_free_cache (FolderItem *item);
+gint folder_item_scan_full (FolderItem *item, gboolean filtering);
static GSList *classlist;
-void folder_system_init()
+void folder_system_init(void)
{
folder_register_class(mh_get_class());
folder_register_class(imap_get_class());
folder_register_class(mbox_get_class());
}
-GSList *folder_get_class_list()
+GSList *folder_get_class_list(void)
{
return classlist;
}
-void folder_register_class(FolderClass *class)
+void folder_register_class(FolderClass *klass)
{
- debug_print("registering folder class %s\n", class->idstr);
- classlist = g_slist_append(classlist, class);
+ debug_print("registering folder class %s\n", klass->idstr);
+ classlist = g_slist_append(classlist, klass);
}
-Folder *folder_new(FolderClass *class, const gchar *name, const gchar *path)
+Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
{
Folder *folder = NULL;
FolderItem *item;
- g_return_val_if_fail(class != NULL, NULL);
+ g_return_val_if_fail(klass != NULL, NULL);
name = name ? name : path;
- folder = class->new(name, path);
+ folder = klass->new_folder(name, path);
/* Create root folder item */
item = folder_item_new(folder, name, NULL);
void folder_destroy(Folder *folder)
{
g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->class->destroy != NULL);
+ g_return_if_fail(folder->klass->destroy_folder != NULL);
folder_list = g_list_remove(folder_list, folder);
folder_tree_destroy(folder);
+
+ folder->klass->destroy_folder(folder);
+
g_free(folder->name);
g_free(folder);
-
- folder->class->destroy(folder);
}
void folder_local_folder_destroy(LocalFolder *lfolder)
{
FolderItem *item = NULL;
- if (folder->class->item_new) {
- item = folder->class->item_new(folder);
+ if (folder->klass->item_new) {
+ item = folder->klass->item_new(folder);
} else {
item = g_new0(FolderItem, 1);
}
item->name = g_strdup(name);
item->path = g_strdup(path);
item->mtime = 0;
- item->new = 0;
- item->unread = 0;
- item->unreadmarked = 0;
- item->total = 0;
+ item->new_msgs = 0;
+ item->unread_msgs = 0;
+ item->unreadmarked_msgs = 0;
+ item->total_msgs = 0;
item->last_num = -1;
item->cache = NULL;
item->no_sub = FALSE;
g_free(item->path);
if (item->folder != NULL) {
- if(item->folder->class->item_destroy) {
- item->folder->class->item_destroy(item->folder, item);
+ if(item->folder->klass->item_destroy) {
+ item->folder->klass->item_destroy(item->folder, item);
} else {
g_free(item);
}
g_return_if_fail(folder != NULL);
g_return_if_fail(folder->node != NULL);
- prefs_scoring_clear();
- prefs_filtering_clear();
+ prefs_scoring_clear_folder(folder);
+ prefs_filtering_clear_folder(folder);
g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_tree_destroy_func, NULL);
if (folder->node)
FolderItem *item = (FolderItem *)node->data;
folder_item_restore_persist_prefs(item, pptable);
+ folder_item_scan_full(item, FALSE);
return FALSE;
}
void folder_scan_tree(Folder *folder)
{
GHashTable *pptable;
+ FolderUpdateData hookdata;
- if (!folder->class->scan_tree)
+ if (!folder->klass->scan_tree)
return;
pptable = folder_persist_prefs_new(folder);
+
+ /*
+ * should be changed and tree update should be done without
+ * destroying the tree first
+ */
folder_tree_destroy(folder);
+ folder->klass->scan_tree(folder);
- folder->class->scan_tree(folder);
+ hookdata.folder = folder;
+ hookdata.update_flags = FOLDER_TREE_CHANGED;
+ hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
folder_persist_prefs_free(pptable);
{
FolderItem *new_item;
- new_item = parent->folder->class->create_folder(parent->folder, parent, name);
+ new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
if (new_item)
new_item->cache = msgcache_new();
struct TotalMsgCount
{
- guint new;
- guint unread;
- guint unreadmarked;
- guint total;
+ guint new_msgs;
+ guint unread_msgs;
+ guint unreadmarked_msgs;
+ guint total_msgs;
};
struct FuncToAllFoldersData
{
struct TotalMsgCount *count = (struct TotalMsgCount *)data;
- count->new += item->new;
- count->unread += item->unread;
- count->unreadmarked += item->unreadmarked;
- count->total += item->total;
+ count->new_msgs += item->new_msgs;
+ count->unread_msgs += item->unread_msgs;
+ count->unreadmarked_msgs += item->unreadmarked_msgs;
+ count->total_msgs += item->total_msgs;
}
-void folder_count_total_msgs(guint *new, guint *unread, guint *unreadmarked, guint *total)
+void folder_count_total_msgs(guint *new_msgs, guint *unread_msgs, guint *unreadmarked_msgs, guint *total_msgs)
{
struct TotalMsgCount count;
- count.new = count.unread = count.unreadmarked = count.total = 0;
+ count.new_msgs = count.unread_msgs = count.unreadmarked_msgs = count.total_msgs = 0;
debug_print("Counting total number of messages...\n");
folder_func_to_all_folders(folder_count_total_msgs_func, &count);
- *new = count.new;
- *unread = count.unread;
- *unreadmarked = count.unreadmarked;
- *total = count.total;
+ *new_msgs = count.new_msgs;
+ *unread_msgs = count.unread_msgs;
+ *unreadmarked_msgs = count.unreadmarked_msgs;
+ *total_msgs = count.total_msgs;
}
Folder *folder_find_from_path(const gchar *path)
return NULL;
}
-Folder *folder_find_from_name(const gchar *name, FolderClass *class)
+Folder *folder_find_from_name(const gchar *name, FolderClass *klass)
{
GList *list;
Folder *folder;
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
- if (folder->class == class && strcmp2(name, folder->name) == 0)
+ if (folder->klass == klass && strcmp2(name, folder->name) == 0)
return folder;
}
g_return_val_if_fail(folder != NULL, NULL);
- type_str = folder->class->idstr;
+ type_str = folder->klass->idstr;
return g_strconcat("#", type_str, "/", folder->name, NULL);
}
switch (item->stype) {
case F_INBOX:
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+ name = g_strdup(!strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
item->name);
break;
case F_OUTBOX:
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+ name = g_strdup(!strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
item->name);
break;
case F_QUEUE:
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+ name = g_strdup(!strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
item->name);
break;
case F_TRASH:
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+ name = g_strdup(!strcmp2(item->name, TRASH_DIR) ? _("Trash") :
item->name);
break;
case F_DRAFT:
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+ name = g_strdup(!strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
item->name);
break;
default:
* the folder knows the ui string and how to abbrev
*/
if (!item->parent) {
- name = g_strconcat(item->name, " (", item->folder->class->uistr, ")", NULL);
+ name = g_strconcat(item->name, " (", item->folder->klass->uistr, ")", NULL);
} else {
if (FOLDER_CLASS(item->folder) == news_get_class() &&
item->path && !strcmp2(item->name, item->path))
folder->queue && folder->trash)
continue;
- if (folder->class->create_tree(folder) < 0) {
+ if (folder->klass->create_tree(folder) < 0) {
g_warning("%s: can't create the folder tree.\n",
LOCAL_FOLDER(folder)->rootpath);
continue;
gint folder_item_open(FolderItem *item)
{
if(((FOLDER_TYPE(item->folder) == F_IMAP) && !item->no_select) || (FOLDER_TYPE(item->folder) == F_NEWS)) {
- folder_item_scan(item);
+ folder_item_scan_full(item, TRUE);
}
/* Processing */
g_return_if_fail(item != NULL);
- if (item->new) {
+ if (item->new_msgs) {
+ folder_item_update_freeze();
mlist = folder_item_get_msg_list(item);
for (cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo;
procmsg_msginfo_free(msginfo);
}
g_slist_free(mlist);
+ folder_item_update_thaw();
}
folder_item_write_cache(item);
folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
}
-gint folder_item_scan(FolderItem *item)
+gint folder_item_scan_full(FolderItem *item, gboolean filtering)
{
Folder *folder;
GSList *folder_list = NULL, *cache_list = NULL;
folder = item->folder;
g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->class->get_num_list != NULL, -1);
+ g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
debug_print("Scanning folder %s for cache changes.\n", item->path);
/* Get list of messages for folder and cache */
- if (folder->class->get_num_list(item->folder, item, &folder_list) < 0) {
+ if (folder->klass->get_num_list(item->folder, item, &folder_list) < 0) {
debug_print("Error fetching list of message numbers\n");
return(-1);
}
- if (!folder->class->check_msgnum_validity ||
- folder->class->check_msgnum_validity(folder, item)) {
+ if (!folder->klass->check_msgnum_validity ||
+ folder->klass->check_msgnum_validity(folder, item)) {
if (!item->cache)
folder_item_read_cache(item);
cache_list = msgcache_get_msg_list(item->cache);
MsgInfo *msginfo;
msginfo = msgcache_get_msg(item->cache, folder_cur_num);
- if (folder->class->is_msg_changed && folder->class->is_msg_changed(folder, item, msginfo)) {
+ if (folder->klass->is_msg_changed && folder->klass->is_msg_changed(folder, item, msginfo)) {
msgcache_remove_msg(item->cache, msginfo->msgnum);
new_list = g_slist_prepend(new_list, GINT_TO_POINTER(msginfo->msgnum));
procmsg_msginfo_free(msginfo);
g_slist_free(folder_list);
if (new_list != NULL) {
- if (folder->class->get_msginfos) {
- newmsg_list = folder->class->get_msginfos(folder, item, new_list);
- } else if (folder->class->get_msginfo) {
+ if (folder->klass->get_msginfos) {
+ newmsg_list = folder->klass->get_msginfos(folder, item, new_list);
+ } else if (folder->klass->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->class->get_msginfo(folder, item, num);
+ msginfo = folder->klass->get_msginfo(folder, item, num);
if (msginfo != NULL) {
newmsg_list = g_slist_prepend(newmsg_list, msginfo);
debug_print("Added newly found message %d to cache.\n", num);
if (newmsg_list != NULL) {
GSList *elem;
- for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem))
- msgcache_add_msg(item->cache, elem->data);
+ for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
+ MsgInfo *msginfo = (MsgInfo *) elem->data;
+
+ msgcache_add_msg(item->cache, msginfo);
+ if ((filtering == TRUE) &&
+ (item->stype == F_INBOX) &&
+ (item->folder->account != NULL) &&
+ (item->folder->account->filter_on_recv) &&
+ procmsg_msginfo_filter(msginfo))
+ procmsg_msginfo_free(msginfo);
+ else
+ exists_list = g_slist_prepend(exists_list, msginfo);
+ }
+ g_slist_free(newmsg_list);
update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
-
- exists_list = g_slist_concat(exists_list, newmsg_list);
}
for (elem = exists_list; elem != NULL; elem = g_slist_next(elem)) {
MsgInfo *msginfo;
msginfo = elem->data;
- 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 (MSG_IS_IGNORE_THREAD(msginfo->flags) && (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
}
+ if ((item->stype == F_OUTBOX ||
+ item->stype == F_QUEUE ||
+ item->stype == F_DRAFT ||
+ item->stype == F_TRASH) &&
+ (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
+ procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ if (MSG_IS_NEW(msginfo->flags))
+ newcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ unreadcnt++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ unreadmarkedcnt++;
totalcnt++;
procmsg_msginfo_free(msginfo);
}
g_slist_free(exists_list);
- item->new = newcnt;
- item->unread = unreadcnt;
- item->total = totalcnt;
- item->unreadmarked = unreadmarkedcnt;
+ item->new_msgs = newcnt;
+ item->unread_msgs = unreadcnt;
+ item->total_msgs = totalcnt;
+ item->unreadmarked_msgs = unreadmarkedcnt;
update_flags |= F_ITEM_UPDATE_MSGCNT;
return 0;
}
+gint folder_item_scan(FolderItem *item)
+{
+ return folder_item_scan_full(item, TRUE);
+}
+
+static gboolean folder_scan_all_items_func(GNode *node, gpointer data)
+{
+ FolderItem *item = node->data;
+
+ folder_item_scan(item);
+
+ return FALSE;
+}
+
+void folder_scan_all_items(Folder * folder)
+{
+ g_node_traverse(folder->node, G_PRE_ORDER,
+ G_TRAVERSE_ALL, -1, folder_scan_all_items_func, NULL);
+}
+
static void folder_item_scan_foreach_func(gpointer key, gpointer val,
gpointer data)
{
item->cache = NULL;
}
-void folder_clean_cache_memory()
+void folder_clean_cache_memory(void)
{
gint memusage = 0;
item->cache = msgcache_read_cache(item, cache_file);
if (!item->cache) {
item->cache = msgcache_new();
- folder_item_scan(item);
+ folder_item_scan_full(item, TRUE);
}
msgcache_read_mark(item->cache, mark_file);
g_free(cache_file);
if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
return msginfo;
- g_return_val_if_fail(folder->class->get_msginfo, NULL);
- if ((msginfo = folder->class->get_msginfo(folder, item, num)) != NULL) {
+ g_return_val_if_fail(folder->klass->get_msginfo, NULL);
+ if ((msginfo = folder->klass->get_msginfo(folder, item, num)) != NULL) {
msgcache_add_msg(item->cache, msginfo);
return msginfo;
}
folder = item->folder;
- g_return_val_if_fail(folder->class->fetch_msg != NULL, NULL);
+ g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
- return folder->class->fetch_msg(folder, item, num);
+ return folder->klass->fetch_msg(folder, item, num);
}
static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
return msgnum;
}
+static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
+{
+ MsgPermFlags perm_flags = 0;
+ MsgTmpFlags tmp_flags = 0;
+
+ /* create new flags */
+ if (source != NULL) {
+ /* copy original flags */
+ perm_flags = source->flags.perm_flags;
+ tmp_flags = source->flags.tmp_flags;
+ } else {
+ perm_flags = dest->flags.perm_flags;
+ tmp_flags = dest->flags.tmp_flags;
+ }
+
+ /* remove new, unread and deleted in special folders */
+ if (dest->folder->stype == F_OUTBOX ||
+ dest->folder->stype == F_QUEUE ||
+ dest->folder->stype == F_DRAFT ||
+ dest->folder->stype == F_TRASH)
+ perm_flags &= ~(MSG_NEW | MSG_UNREAD | MSG_DELETED);
+
+ /* set ignore flag of ignored parent exists */
+ if (procmsg_msg_has_flagged_parent(dest, MSG_IGNORE_THREAD))
+ perm_flags |= MSG_IGNORE_THREAD;
+
+ /* Unset tmp flags that should not be copied */
+ tmp_flags &= ~(MSG_MOVE | MSG_COPY);
+
+ /* unset flags that are set but should not */
+ procmsg_msginfo_unset_flags(dest,
+ dest->flags.perm_flags & ~perm_flags,
+ dest->flags.tmp_flags & ~tmp_flags);
+ /* set new flags */
+ procmsg_msginfo_set_flags(dest,
+ ~dest->flags.perm_flags & perm_flags,
+ ~dest->flags.tmp_flags & tmp_flags);
+
+ folder_item_update(dest->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+}
+
+static void add_msginfo_to_cache(FolderItem *item, MsgInfo *newmsginfo, MsgInfo *flagsource)
+{
+ /* update folder stats */
+ if (MSG_IS_NEW(newmsginfo->flags))
+ item->new_msgs++;
+ if (MSG_IS_UNREAD(newmsginfo->flags))
+ item->unread_msgs++;
+ if (MSG_IS_UNREAD(newmsginfo->flags) && procmsg_msg_has_marked_parent(newmsginfo))
+ item->unreadmarked_msgs++;
+ item->total_msgs++;
+
+ copy_msginfo_flags(flagsource, newmsginfo);
+
+ msgcache_add_msg(item->cache, newmsginfo);
+}
+
+static void remove_msginfo_from_cache(FolderItem *item, MsgInfo *msginfo)
+{
+ if (!item->cache)
+ folder_item_read_cache(item);
+
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ msginfo->folder->new_msgs--;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ msginfo->folder->unread_msgs--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ msginfo->folder->unreadmarked_msgs--;
+ msginfo->folder->total_msgs--;
+
+ msgcache_remove_msg(item->cache, msginfo->msgnum);
+ folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+}
+
gint folder_item_add_msg(FolderItem *dest, const gchar *file,
gboolean remove_source)
{
folder = dest->folder;
- g_return_val_if_fail(folder->class->add_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->add_msg != NULL, -1);
if (!dest->cache)
folder_item_read_cache(dest);
- num = folder->class->add_msg(folder, dest, file, FALSE);
+ num = folder->klass->add_msg(folder, dest, file, FALSE);
if (num > 0) {
- msginfo = folder->class->get_msginfo(folder, dest, num);
+ msginfo = folder->klass->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++;
-
- msgcache_add_msg(dest->cache, msginfo);
+ add_msginfo_to_cache(dest, msginfo, NULL);
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);
+ folder_item_scan_full(dest, FALSE);
num = folder_item_get_msg_num_by_file(dest, file);
}
FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
{
GSList *mlist;
- GSList *cur;
FolderItem *new_item;
FolderItem *next_item;
GNode *srcnode;
- int cnt = 0;
gchar *old_id, *new_id;
mlist = folder_item_get_msg_list(src);
new_item->folder = dest->folder;
/* move messages */
- for (cur = mlist ; cur != NULL ; cur = cur->next) {
- MsgInfo * msginfo;
- cnt++;
- if (cnt%500)
- 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);
-
- procmsg_msginfo_free(msginfo);
- }
+ log_message(_("Moving %s to %s...\n"),
+ src->name, new_item->path);
+ folder_item_move_msgs_with_dest(new_item, mlist);
/*copy prefs*/
prefs_folder_item_copy_prefs(src, new_item);
new_id = folder_item_get_identifier(new_item);
debug_print("updating rules : %s => %s\n", old_id, new_id);
- src->folder->class->remove_folder(src->folder, src);
+ src->folder->klass->remove_folder(src->folder, src);
folder_write_list();
if (old_id != NULL && new_id != NULL)
}
*/
+
+
gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
{
Folder *folder;
folder = dest->folder;
- g_return_val_if_fail(folder->class->copy_msg != NULL, -1);
- g_return_val_if_fail(folder->class->remove_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
/*
* Copy messages to destination folder and
if (!item && msginfo->folder != NULL)
item = msginfo->folder;
- num = folder->class->copy_msg(folder, dest, msginfo);
+ num = folder->klass->copy_msg(folder, dest, msginfo);
newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
}
gchar *file;
if (!folderscan) {
- folder_item_scan(dest);
+ folder_item_scan_full(dest, FALSE);
folderscan = TRUE;
}
file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
if (num == 0)
continue;
- if (!folderscan) {
- newmsginfo = folder->class->get_msginfo(folder, dest, num);
- if (newmsginfo) {
- newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- msgcache_add_msg(dest->cache, newmsginfo);
-
- if (MSG_IS_NEW(newmsginfo->flags))
- 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++;
- folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
-
- procmsg_msginfo_free(newmsginfo);
- }
- } else {
- newmsginfo = msgcache_get_msg(dest->cache, num);
- procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
- procmsg_msginfo_set_flags(newmsginfo, msginfo->flags.perm_flags, 0);
+ if (!folderscan &&
+ ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
+ add_msginfo_to_cache(dest, newmsginfo, msginfo);
+ procmsg_msginfo_free(newmsginfo);
+ } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
+ copy_msginfo_flags(msginfo, newmsginfo);
+ procmsg_msginfo_free(newmsginfo);
}
}
}
l2 = g_slist_next(l2);
if (num >= 0) {
- item->folder->class->remove_msg(item->folder,
+ item->folder->klass->remove_msg(item->folder,
msginfo->folder,
msginfo->msgnum);
- if (!item->cache)
- folder_item_read_cache(item);
- msgcache_remove_msg(item->cache, msginfo->msgnum);
-
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- msginfo->folder->new--;
- 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--;
- folder_item_update(msginfo->folder, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
+ remove_msginfo_from_cache(item, msginfo);
}
}
- if (folder->class->finished_copy)
- folder->class->finished_copy(folder, dest);
+ if (folder->klass->finished_copy)
+ folder->klass->finished_copy(folder, dest);
g_slist_free(newmsgnums);
return lastnum;
folder = dest->folder;
- g_return_val_if_fail(folder->class->copy_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
/*
* Copy messages to destination folder and
for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
MsgInfo * msginfo = (MsgInfo *) l->data;
- num = folder->class->copy_msg(folder, dest, msginfo);
+ num = folder->klass->copy_msg(folder, dest, msginfo);
newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
}
gchar *file;
if (!folderscan) {
- folder_item_scan(dest);
+ folder_item_scan_full(dest, FALSE);
folderscan = TRUE;
}
file = folder_item_fetch_msg(msginfo->folder, msginfo->msgnum);
if (num == 0)
continue;
- if (!folderscan) {
- newmsginfo = folder->class->get_msginfo(folder, dest, num);
- if (newmsginfo) {
- newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
- msgcache_add_msg(dest->cache, newmsginfo);
-
- if (MSG_IS_NEW(newmsginfo->flags))
- 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++;
- folder_item_update(dest, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
-
- procmsg_msginfo_free(newmsginfo);
- }
- } else {
- newmsginfo = msgcache_get_msg(dest->cache, num);
- procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
- procmsg_msginfo_set_flags(newmsginfo, msginfo->flags.perm_flags, 0);
+ if (!folderscan &&
+ ((newmsginfo = folder->klass->get_msginfo(folder, dest, num)) != NULL)) {
+ newmsginfo = folder->klass->get_msginfo(folder, dest, num);
+ add_msginfo_to_cache(dest, newmsginfo, msginfo);
+ procmsg_msginfo_free(newmsginfo);
+ } else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
+ copy_msginfo_flags(msginfo, newmsginfo);
+ procmsg_msginfo_free(newmsginfo);
}
}
}
- if (folder->class->finished_copy)
- folder->class->finished_copy(folder, dest);
+ if (folder->klass->finished_copy)
+ folder->klass->finished_copy(folder, dest);
g_slist_free(newmsgnums);
return lastnum;
MsgInfo *msginfo;
g_return_val_if_fail(item != NULL, -1);
-
folder = item->folder;
+ g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+
if (!item->cache) folder_item_read_cache(item);
- ret = folder->class->remove_msg(folder, item, num);
+ ret = folder->klass->remove_msg(folder, item, num);
msginfo = msgcache_get_msg(item->cache, num);
if (msginfo != NULL) {
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- item->new--;
- 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--;
+ remove_msginfo_from_cache(item, msginfo);
procmsg_msginfo_free(msginfo);
- msgcache_remove_msg(item->cache, num);
}
- item->total--;
folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
return ret;
if (!item->cache) folder_item_read_cache(item);
- if (folder->class->remove_msgs) {
- ret = folder->class->remove_msgs(folder, item, msglist);
- if (ret == 0)
- folder_item_scan(item);
- return ret;
- }
-
while (msglist != NULL) {
MsgInfo *msginfo = (MsgInfo *)msglist->data;
folder = item->folder;
- g_return_val_if_fail(folder->class->remove_all_msg != NULL, -1);
+ g_return_val_if_fail(folder->klass->remove_all_msg != NULL, -1);
- result = folder->class->remove_all_msg(folder, item);
+ result = folder->klass->remove_all_msg(folder, item);
if (result == 0) {
- if (folder->class->finished_remove)
- folder->class->finished_remove(folder, item);
+ if (folder->klass->finished_remove)
+ folder->klass->finished_remove(folder, item);
folder_item_free_cache(item);
item->cache = msgcache_new();
- item->new = 0;
- item->unread = 0;
- item->unreadmarked = 0;
- item->total = 0;
+ item->new_msgs = 0;
+ item->unread_msgs = 0;
+ item->unreadmarked_msgs = 0;
+ item->total_msgs = 0;
folder_item_update(item, F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT);
}
return result;
}
+void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
+{
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(msginfo != NULL);
+
+ if (item->folder->klass->change_flags != NULL) {
+ item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
+ } else {
+ msginfo->flags.perm_flags = newflags;
+ }
+}
+
gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
{
Folder *folder;
folder = item->folder;
- g_return_val_if_fail(folder->class->is_msg_changed != NULL, -1);
+ g_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
- return folder->class->is_msg_changed(folder, item, msginfo);
+ return folder->klass->is_msg_changed(folder, item, msginfo);
}
gchar *folder_item_get_cache_file(FolderItem *item)
item = folder_item_new(folder, name, path);
item->stype = stype;
item->mtime = mtime;
- item->new = new;
- item->unread = unread;
- item->unreadmarked = unreadmarked;
- item->total = total;
+ item->new_msgs = new;
+ item->unread_msgs = unread;
+ item->unreadmarked_msgs = unreadmarked;
+ item->total_msgs = total;
item->no_sub = no_sub;
item->no_select = no_select;
item->collapsed = collapsed;
if (depth == 1) {
Folder *folder = item->folder;
- fprintf(fp, "<folder type=\"%s\"", folder->class->idstr);
+ fprintf(fp, "<folder type=\"%s\"", folder->klass->idstr);
if (folder->name)
PUT_ESCAPE_STR(fp, "name", folder->name);
if (FOLDER_TYPE(folder) == F_MH || FOLDER_TYPE(folder) == F_MBOX)
fprintf(fp,
" mtime=\"%lu\" new=\"%d\" unread=\"%d\" unreadmarked=\"%d\" total=\"%d\"",
- item->mtime, item->new, item->unread, item->unreadmarked, item->total);
+ item->mtime, item->new_msgs, item->unread_msgs, item->unreadmarked_msgs, item->total_msgs);
if (item->account)
fprintf(fp, " account_id=\"%d\"",
}
}
-void folder_update_op_count() {
+void folder_update_op_count(void)
+{
GList *cur;
Folder *folder;
*/
/* CLAWS: temporary local folder for filtering */
-static Folder *processing_folder;
+#define TEMP_FOLDER "TEMP_FOLDER"
+#define PROCESSING_FOLDER_ITEM "processing"
+
static FolderItem *processing_folder_item;
static void folder_create_processing_folder(void)
{
-#define PROCESSING_FOLDER ".processing"
- Folder *tmpparent;
+ Folder *processing_folder;
gchar *tmpname;
- tmpparent = folder_get_default_folder();
- g_assert(tmpparent);
- debug_print("tmpparentroot %s\n", LOCAL_FOLDER(tmpparent)->rootpath);
- if (LOCAL_FOLDER(tmpparent)->rootpath[0] == '/')
- tmpname = g_strconcat(LOCAL_FOLDER(tmpparent)->rootpath,
- G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+ if ((processing_folder = folder_find_from_name(TEMP_FOLDER, mh_get_class())) == NULL) {
+ gchar *tmppath;
+
+ tmppath =
+ g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ "tempfolder", NULL);
+ processing_folder =
+ folder_new(mh_get_class(), TEMP_FOLDER, tmppath);
+ g_free(tmppath);
+ }
+ g_assert(processing_folder != NULL);
+
+ debug_print("tmpparentroot %s\n", LOCAL_FOLDER(processing_folder)->rootpath);
+ if (LOCAL_FOLDER(processing_folder)->rootpath[0] == '/')
+ tmpname = g_strconcat(LOCAL_FOLDER(processing_folder)->rootpath,
+ G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
NULL);
else
tmpname = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
- LOCAL_FOLDER(tmpparent)->rootpath,
- G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+ LOCAL_FOLDER(processing_folder)->rootpath,
+ G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
NULL);
- processing_folder = folder_new(mh_get_class(), "PROCESSING", LOCAL_FOLDER(tmpparent)->rootpath);
- g_assert(processing_folder);
-
if (!is_dir_exist(tmpname)) {
debug_print("*TMP* creating %s\n", tmpname);
- processing_folder_item = processing_folder->class->create_folder(processing_folder,
+ processing_folder_item = processing_folder->klass->create_folder(processing_folder,
processing_folder->node->data,
- PROCESSING_FOLDER);
- g_assert(processing_folder_item);
- }
- else {
+ PROCESSING_FOLDER_ITEM);
+ } else {
debug_print("*TMP* already created\n");
- processing_folder_item = folder_item_new(processing_folder, ".processing", ".processing");
+ processing_folder_item = folder_item_new(processing_folder, PROCESSING_FOLDER_ITEM, PROCESSING_FOLDER_ITEM);
g_assert(processing_folder_item);
folder_item_append(processing_folder->node->data, processing_folder_item);
}
+ g_assert(processing_folder_item != NULL);
g_free(tmpname);
}
}
}
-void folder_item_update_freeze()
+void folder_item_update_freeze(void)
{
folder_item_update_freeze_cnt++;
}
}
}
-void folder_item_update_thaw()
+void folder_item_update_thaw(void)
{
if (folder_item_update_freeze_cnt > 0)
folder_item_update_freeze_cnt--;
projects / claws.git / blobdiff