/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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 "procheader.h"
#include "utils.h"
-static void mh_folder_init (Folder *folder,
- const gchar *name,
- const gchar *path);
-
-GSList *mh_get_msg_list (Folder *folder,
- FolderItem *item,
- gboolean use_cache);
-gchar *mh_fetch_msg (Folder *folder,
- FolderItem *item,
- gint num);
-MsgInfo *mh_get_msginfo (Folder *folder,
- FolderItem *item,
- gint num);
-gint mh_add_msg (Folder *folder,
- FolderItem *dest,
- const gchar *file,
- gboolean remove_source);
-gint mh_move_msg (Folder *folder,
- FolderItem *dest,
- MsgInfo *msginfo);
-gint mh_move_msgs_with_dest (Folder *folder,
- FolderItem *dest,
- GSList *msglist);
-gint mh_copy_msg (Folder *folder,
- FolderItem *dest,
- MsgInfo *msginfo);
-gint mh_copy_msgs_with_dest (Folder *folder,
- FolderItem *dest,
- GSList *msglist);
-gint mh_remove_msg (Folder *folder,
- FolderItem *item,
- gint num);
-gint mh_remove_all_msg (Folder *folder,
- FolderItem *item);
-gboolean mh_is_msg_changed (Folder *folder,
- FolderItem *item,
- MsgInfo *msginfo);
-
-gint mh_scan_folder (Folder *folder,
- FolderItem *item);
-gint mh_get_num_list (Folder *folder,
- FolderItem *item,
- GSList **list);
-void mh_scan_tree (Folder *folder);
-
-gint mh_create_tree (Folder *folder);
-FolderItem *mh_create_folder (Folder *folder,
- FolderItem *parent,
- const gchar *name);
-gint mh_rename_folder (Folder *folder,
- FolderItem *item,
- const gchar *name);
-gint mh_remove_folder (Folder *folder,
- FolderItem *item);
-
-gchar *mh_get_new_msg_filename (FolderItem *dest);
-
-static MsgInfo *mh_parse_msg (const gchar *file,
- FolderItem *item);
-static void mh_scan_tree_recursive (FolderItem *item);
-
-static gboolean mh_rename_folder_func (GNode *node,
- gpointer data);
-
+static void mh_folder_init(Folder * folder,
+ const gchar * name, const gchar * path);
+
+static Folder *mh_folder_new(const gchar * name, const gchar * path);
+static void mh_folder_destroy(Folder * folder);
+static gchar *mh_fetch_msg(Folder * folder, FolderItem * item, gint num);
+static MsgInfo *mh_get_msginfo(Folder * folder,
+ FolderItem * item, gint num);
+static gint mh_add_msg(Folder * folder,
+ FolderItem * dest,
+ const gchar * file,
+ MsgFlags * flags);
+static gint mh_add_msgs(Folder * folder,
+ FolderItem * dest, GSList * file_list, GRelation *relation);
+static gint mh_copy_msg(Folder * folder,
+ FolderItem * dest, MsgInfo * msginfo);
+static gint mh_remove_msg(Folder * folder, FolderItem * item, gint num);
+static gint mh_remove_all_msg(Folder * folder, FolderItem * item);
+static gboolean mh_is_msg_changed(Folder * folder,
+ FolderItem * item, MsgInfo * msginfo);
+
+static gint mh_get_num_list(Folder * folder,
+ FolderItem * item, GSList ** list, gboolean *old_uids_valid);
+static gint mh_scan_tree(Folder * folder);
+
+static gint mh_create_tree(Folder * folder);
+static FolderItem *mh_create_folder(Folder * folder,
+ FolderItem * parent,
+ const gchar * name);
+static gint mh_rename_folder(Folder * folder,
+ FolderItem * item, const gchar * name);
+static gint mh_remove_folder(Folder * folder, FolderItem * item);
+
+static gchar *mh_get_new_msg_filename(FolderItem * dest);
+
+static MsgInfo *mh_parse_msg(const gchar * file, FolderItem * item);
+static void mh_remove_missing_folder_items (Folder *folder);
+static void mh_scan_tree_recursive(FolderItem * item);
+
+static gboolean mh_rename_folder_func(GNode * node, gpointer data);
+static gchar *mh_item_get_path(Folder *folder, FolderItem *item);
FolderClass mh_class =
{
F_MH,
"mh",
+ "MH",
/* Folder functions */
mh_folder_new,
/* FolderItem functions */
NULL,
NULL,
+ mh_item_get_path,
mh_create_folder,
mh_rename_folder,
mh_remove_folder,
+ NULL,
mh_get_num_list,
NULL,
NULL,
NULL,
mh_fetch_msg,
mh_add_msg,
- mh_move_msg,
- mh_move_msgs_with_dest,
+ mh_add_msgs,
mh_copy_msg,
- mh_copy_msgs_with_dest,
- mh_remove_msg,
NULL,
+ mh_remove_msg,
mh_remove_all_msg,
mh_is_msg_changed,
NULL,
};
-FolderClass *mh_get_class()
+FolderClass *mh_get_class(void)
{
return &mh_class;
}
Folder *folder;
folder = (Folder *)g_new0(MHFolder, 1);
- folder->class = &mh_class;
+ folder->klass = &mh_class;
mh_folder_init(folder, name, path);
return folder;
}
-void mh_folder_destroy(Folder *folder)
+static void mh_folder_destroy(Folder *folder)
{
folder_local_folder_destroy(LOCAL_FOLDER(folder));
}
item->last_num = max;
}
-gint mh_get_num_list(Folder *folder, FolderItem *item, GSList **list)
+gint mh_get_num_list(Folder *folder, FolderItem *item, GSList **list, gboolean *old_uids_valid)
{
gchar *path;
debug_print("mh_get_last_num(): Scanning %s ...\n", item->path);
+ *old_uids_valid = TRUE;
+
path = folder_item_get_path(item);
g_return_val_if_fail(path != NULL, -1);
if (change_dir(path) < 0) {
return destfile;
}
-#define SET_DEST_MSG_FLAGS(fp, dest, msginfo) \
-{ \
- MsgInfo newmsginfo; \
- \
- newmsginfo.msgnum = dest->last_num; \
- newmsginfo.flags = msginfo->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); \
- \
- procmsg_write_flags(&newmsginfo, fp); \
-}
-
-gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
- gboolean remove_source)
+gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file, MsgFlags *flags)
{
- gchar *destfile;
+ gint ret;
+ GSList file_list;
+ MsgFileInfo fileinfo;
- g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(file != NULL, -1);
- if (dest->last_num < 0) {
- mh_get_last_num(folder, dest);
- if (dest->last_num < 0) return -1;
- }
-
- destfile = mh_get_new_msg_filename(dest);
- g_return_val_if_fail(destfile != NULL, -1);
-
- if (link(file, destfile) < 0) {
- if (copy_file(file, destfile, TRUE) < 0) {
- g_warning("can't copy message %s to %s\n",
- file, destfile);
- g_free(destfile);
- return -1;
- }
- }
-
- if (remove_source) {
- if (unlink(file) < 0)
- FILE_OP_ERROR(file, "unlink");
- }
-
- g_free(destfile);
- dest->last_num++;
- return dest->last_num;
-}
-
-static gint mh_do_move(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
-{
- gchar *srcfile;
- gchar *destfile;
- gint filemode = 0;
- PrefsFolderItem *prefs;
-
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
-
- if (msginfo->folder == dest) {
- g_warning("the src folder is identical to the dest.\n");
- return -1;
- }
-
- if (dest->last_num < 0) {
- mh_get_last_num(folder, dest);
- if (dest->last_num < 0) return -1;
- }
-
- prefs = dest->prefs;
-
- destfile = mh_get_new_msg_filename(dest);
- if (!destfile) return -1;
+ fileinfo.msginfo = NULL;
+ fileinfo.file = (gchar *)file;
+ fileinfo.flags = flags;
+ file_list.data = &fileinfo;
+ file_list.next = NULL;
- srcfile = procmsg_get_message_file(msginfo);
-
- debug_print("Moving message %s%c%d to %s ...\n",
- msginfo->folder->path, G_DIR_SEPARATOR,
- msginfo->msgnum, dest->path);
-
- if (move_file(srcfile, destfile, FALSE) < 0) {
- g_free(srcfile);
- g_free(destfile);
- return -1;
- }
-
- if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
- if (chmod(destfile, prefs->folder_chmod) < 0)
- FILE_OP_ERROR(destfile, "chmod");
-
- /* for mark file */
- filemode = prefs->folder_chmod;
- if (filemode & S_IRGRP) filemode |= S_IWGRP;
- if (filemode & S_IROTH) filemode |= S_IWOTH;
- }
-
- g_free(srcfile);
- g_free(destfile);
- dest->last_num++;
-
- return dest->last_num;
-}
-
-gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
-{
- gchar *srcfile;
- gint ret = 0;
-
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
- g_return_val_if_fail(msginfo->folder != NULL, -1);
-
- if (folder == msginfo->folder->folder)
- return mh_do_move(folder, dest, msginfo);
-
- srcfile = procmsg_get_message_file(msginfo);
- if (!srcfile) return -1;
-
- ret = mh_add_msg(folder, dest, srcfile, FALSE);
- g_free(srcfile);
-
- if (ret != -1)
- ret = folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+ ret = mh_add_msgs(folder, dest, &file_list, NULL);
+ return ret;
+}
- return ret;
-}
-
-static gint mh_do_move_msgs_with_dest(Folder *folder, FolderItem *dest,
- GSList *msglist)
-{
- gchar *srcfile;
+gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
+ GRelation *relation)
+{
gchar *destfile;
GSList *cur;
- MsgInfo *msginfo;
- PrefsFolderItem *prefs;
+ MsgFileInfo *fileinfo;
g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ g_return_val_if_fail(file_list != NULL, -1);
if (dest->last_num < 0) {
mh_get_last_num(folder, dest);
if (dest->last_num < 0) return -1;
}
- prefs = dest->prefs;
-
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
-
- if (msginfo->folder == dest) {
- g_warning("the src folder is identical to the dest.\n");
- continue;
- }
- debug_print("Moving message %s%c%d to %s ...\n",
- msginfo->folder->path, G_DIR_SEPARATOR,
- msginfo->msgnum, dest->path);
+ for (cur = file_list; cur != NULL; cur = cur->next) {
+ fileinfo = (MsgFileInfo *)cur->data;
destfile = mh_get_new_msg_filename(dest);
- if (!destfile) return -1;
- srcfile = procmsg_get_message_file(msginfo);
-
- if (move_file(srcfile, destfile, FALSE) < 0) {
- g_free(srcfile);
- g_free(destfile);
- break;
+ if (destfile == NULL) return -1;
+
+ if (link(fileinfo->file, destfile) < 0) {
+ if (copy_file(fileinfo->file, destfile, TRUE) < 0) {
+ g_warning(_("can't copy message %s to %s\n"),
+ fileinfo->file, destfile);
+ g_free(destfile);
+ return -1;
+ }
}
-
- g_free(srcfile);
+ if (relation != NULL)
+ g_relation_insert(relation, fileinfo, GINT_TO_POINTER(dest->last_num + 1));
g_free(destfile);
dest->last_num++;
}
return dest->last_num;
}
-gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
-{
- MsgInfo *msginfo;
- GSList *cur;
- gint ret = 0;
-
- msginfo = (MsgInfo *)msglist->data;
- if (folder == msginfo->folder->folder)
- return mh_do_move_msgs_with_dest(folder, dest, msglist);
-
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- ret = mh_move_msg(folder, dest, msginfo);
- if (ret == -1) break;
- }
-
- return ret;
-}
-
gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
{
gchar *srcfile;
gchar *destfile;
gint filemode = 0;
- PrefsFolderItem *prefs;
+ FolderItemPrefs *prefs;
g_return_val_if_fail(dest != NULL, -1);
g_return_val_if_fail(msginfo != NULL, -1);
return dest->last_num;
}
-/*
-gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
-{
- Folder * src_folder;
- gchar * filename;
- gint num;
- gchar * destdir;
- FILE * fp;
-
- src_folder = msginfo->folder->folder;
-
- g_return_val_if_fail(src_folder->fetch_msg != NULL, -1);
-
- filename = src_folder->fetch_msg(src_folder,
- msginfo->folder,
- msginfo->msgnum);
- if (filename == NULL)
- return -1;
-
- num = folder->add_msg(folder, dest, filename, FALSE);
-
- destdir = folder_item_get_path(dest);
-
- if (fp) {
- MsgInfo newmsginfo;
-
- newmsginfo.msgnum = dest->last_num;
- newmsginfo.flags = msginfo->flags;
- if (dest->stype == F_OUTBOX ||
- dest->stype == F_QUEUE ||
- dest->stype == F_DRAFT ||
- dest->stype == F_TRASH)
- MSG_UNSET_FLAGS(newmsginfo.flags,
- MSG_NEW|MSG_UNREAD|MSG_DELETED);
-
- procmsg_write_flags(&newmsginfo, fp);
- fclose(fp);
- }
-
- return num;
-}
-*/
-
-gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
-{
- gchar *srcfile;
- gchar *destfile;
- GSList *cur;
- MsgInfo *msginfo;
-
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
-
- if (dest->last_num < 0) {
- mh_get_last_num(folder, dest);
- if (dest->last_num < 0) return -1;
- }
-
- for (cur = msglist; cur != NULL; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
-
- if (msginfo->folder == dest) {
- g_warning("the src folder is identical to the dest.\n");
- continue;
- }
- debug_print("Copying message %s%c%d to %s ...\n",
- msginfo->folder->path, G_DIR_SEPARATOR,
- msginfo->msgnum, dest->path);
-
- destfile = mh_get_new_msg_filename(dest);
- if (!destfile) break;
- srcfile = procmsg_get_message_file(msginfo);
-
- if (copy_file(srcfile, destfile, TRUE) < 0) {
- FILE_OP_ERROR(srcfile, "copy");
- g_free(srcfile);
- g_free(destfile);
- break;
- }
-
- g_free(srcfile);
- g_free(destfile);
- dest->last_num++;
- }
-
- return dest->last_num;
-}
-
gint mh_remove_msg(Folder *folder, FolderItem *item, gint num)
{
gchar *file;
return FALSE;
}
-gint mh_scan_folder(Folder *folder, FolderItem *item)
-{
- gchar *path;
- DIR *dp;
- struct dirent *d;
- struct stat s;
- gint max = 0;
- gint num;
-
- g_return_val_if_fail(item != NULL, -1);
-
- debug_print("mh_scan_folder(): Scanning %s ...\n", item->path);
-
- path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, -1);
- if (change_dir(path) < 0) {
- g_free(path);
- return -1;
- }
- g_free(path);
-
- if ((dp = opendir(".")) == NULL) {
- FILE_OP_ERROR(item->path, "opendir");
- return -1;
- }
-
- if (folder->ui_func)
- folder->ui_func(folder, item, folder->ui_func_data);
-
- while ((d = readdir(dp)) != NULL) {
- if ((num = to_number(d->d_name)) >= 0 &&
- stat(d->d_name, &s) == 0 &&
- S_ISREG(s.st_mode)) {
-/*
- n_msg++;
-*/
- if (max < num)
- max = num;
- }
- }
- closedir(dp);
-
-/*
- if (n_msg == 0)
- item->new = item->unread = item->total = 0;
- else {
- gint new, unread, total, min, max;
-
- procmsg_get_mark_sum(".", &new, &unread, &total, &min, &max, 0);
- if (n_msg > total) {
- new += n_msg - total;
- unread += n_msg - total;
- }
- item->new = new;
- item->unread = unread;
- item->total = n_msg;
- }
-*/
- debug_print("Last number in dir %s = %d\n", item->path, max);
- item->last_num = max;
-
- return 0;
-}
-
-void mh_scan_tree(Folder *folder)
+gint mh_scan_tree(Folder *folder)
{
FolderItem *item;
gchar *rootpath;
- g_return_if_fail(folder != NULL);
+ g_return_val_if_fail(folder != NULL, -1);
- item = folder_item_new(folder, folder->name, NULL);
- item->folder = folder;
- folder->node = g_node_new(item);
+ if (!folder->node) {
+ item = folder_item_new(folder, folder->name, NULL);
+ item->folder = folder;
+ folder->node = item->node = g_node_new(item);
+ } else
+ item = FOLDER_ITEM(folder->node->data);
rootpath = folder_item_get_path(item);
if (change_dir(rootpath) < 0) {
g_free(rootpath);
- return;
+ return -1;
}
g_free(rootpath);
mh_create_tree(folder);
+ mh_remove_missing_folder_items(folder);
mh_scan_tree_recursive(item);
+
+ return 0;
}
#define MAKE_DIR_IF_NOT_EXIST(dir) \
#undef MAKE_DIR_IF_NOT_EXIST
+gchar *mh_item_get_path(Folder *folder, FolderItem *item)
+{
+ gchar *folder_path, *path;
+
+ g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(item != NULL, NULL);
+
+ folder_path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
+ g_return_val_if_fail(folder_path != NULL, NULL);
+
+ if (folder_path[0] == G_DIR_SEPARATOR) {
+ if (item->path)
+ path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strdup(folder_path);
+ } else {
+ if (item->path)
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, G_DIR_SEPARATOR_S,
+ item->path, NULL);
+ else
+ path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+ folder_path, NULL);
+ }
+ g_free(folder_path);
+
+ return path;
+}
+
FolderItem *mh_create_folder(Folder *folder, FolderItem *parent,
const gchar *name)
{
gchar *oldpath;
gchar *dirname;
gchar *newpath;
- GNode *node;
gchar *paths[2];
g_return_val_if_fail(folder != NULL, -1);
g_free(item->name);
item->name = g_strdup(name);
- node = g_node_find(item->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL,
- item);
paths[0] = g_strdup(item->path);
paths[1] = newpath;
- g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ g_node_traverse(item->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
mh_rename_folder_func, paths);
g_free(paths[0]);
}
#endif
+static gboolean mh_remove_missing_folder_items_func(GNode *node, gpointer data)
+{
+ FolderItem *item;
+ gchar *path;
+
+ g_return_val_if_fail(node->data != NULL, FALSE);
+
+ if (G_NODE_IS_ROOT(node))
+ return FALSE;
+
+ item = FOLDER_ITEM(node->data);
+
+ path = folder_item_get_path(item);
+ if (!is_dir_exist(path)) {
+ debug_print("folder '%s' not found. removing...\n", path);
+ folder_item_remove(item);
+ }
+ g_free(path);
+
+ return FALSE;
+}
+
+static void mh_remove_missing_folder_items(Folder *folder)
+{
+ g_return_if_fail(folder != NULL);
+
+ debug_print("searching missing folders...\n");
+
+ g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
+ mh_remove_missing_folder_items_func, folder);
+}
+
static void mh_scan_tree_recursive(FolderItem *item)
{
+ Folder *folder;
DIR *dp;
struct dirent *d;
struct stat s;
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
+ folder = item->folder;
+
dp = opendir(item->path ? item->path : ".");
if (!dp) {
FILE_OP_ERROR(item->path ? item->path : ".", "opendir");
debug_print("scanning %s ...\n",
item->path ? item->path
: LOCAL_FOLDER(item->folder)->rootpath);
- if (item->folder->ui_func)
- item->folder->ui_func(item->folder, item,
- item->folder->ui_func_data);
+ if (folder->ui_func)
+ folder->ui_func(folder, item, folder->ui_func_data);
while ((d = readdir(dp)) != NULL) {
if (d->d_name[0] == '.') continue;
}
if (S_ISDIR(s.st_mode)) {
- FolderItem *new_item;
+ FolderItem *new_item = NULL;
+ GNode *node;
#if 0
if (mh_is_maildir(entry)) {
}
#endif
- new_item = folder_item_new(item->folder, d->d_name, entry);
- folder_item_append(item, new_item);
+ node = item->node;
+ for (node = node->children; node != NULL; node = node->next) {
+ FolderItem *cur_item = FOLDER_ITEM(node->data);
+ if (!strcmp2(cur_item->path, entry)) {
+ new_item = cur_item;
+ break;
+ }
+ }
+ if (!new_item) {
+ debug_print("new folder '%s' found.\n", entry);
+ new_item = folder_item_new(folder, d->d_name, entry);
+ folder_item_append(item, new_item);
+ }
+
if (!item->path) {
- if (!strcmp(d->d_name, INBOX_DIR)) {
+ if (!folder->inbox &&
+ !strcmp(d->d_name, INBOX_DIR)) {
new_item->stype = F_INBOX;
- item->folder->inbox = new_item;
- } else if (!strcmp(d->d_name, OUTBOX_DIR)) {
+ folder->inbox = new_item;
+ } else if (!folder->outbox &&
+ !strcmp(d->d_name, OUTBOX_DIR)) {
new_item->stype = F_OUTBOX;
- item->folder->outbox = new_item;
- } else if (!strcmp(d->d_name, DRAFT_DIR)) {
+ folder->outbox = new_item;
+ } else if (!folder->draft &&
+ !strcmp(d->d_name, DRAFT_DIR)) {
new_item->stype = F_DRAFT;
- item->folder->draft = new_item;
- } else if (!strcmp(d->d_name, QUEUE_DIR)) {
+ folder->draft = new_item;
+ } else if (!folder->queue &&
+ !strcmp(d->d_name, QUEUE_DIR)) {
new_item->stype = F_QUEUE;
- item->folder->queue = new_item;
- } else if (!strcmp(d->d_name, TRASH_DIR)) {
+ folder->queue = new_item;
+ } else if (!folder->trash &&
+ !strcmp(d->d_name, TRASH_DIR)) {
new_item->stype = F_TRASH;
- item->folder->trash = new_item;
+ folder->trash = new_item;
}
}
+
mh_scan_tree_recursive(new_item);
} else if (to_number(d->d_name) != -1) n_msg++;