}
}
g_list_free(folderlist);
+
+ if (klass->prefs_pages)
+ g_slist_free(klass->prefs_pages);
}
Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
hookdata.folder = folder;
hookdata.update_flags = FOLDER_TREE_CHANGED;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
{
FolderItem *item = NULL;
-
+
cm_return_val_if_fail(folder != NULL, NULL);
-
+
if (folder->klass->item_new) {
item = folder->klass->item_new(folder);
} else {
cm_return_val_if_fail(item != NULL, NULL);
item->stype = F_NORMAL;
- item->name = g_strdup(name);
+
+ if(!g_utf8_validate(name, -1, NULL)) {
+ item->name = g_malloc(strlen(name)*2+1);
+ conv_localetodisp(item->name, strlen(name)*2+1, name);
+ } else {
+ item->name = g_strdup(name);
+ }
+
item->path = g_strdup(path);
item->mtime = 0;
item->new_msgs = 0;
folder_item_remove(sub_item);
}
}
-
+
/* remove myself */
if (item->cache != NULL) {
msgcache_destroy(item->cache);
hookdata.folder = item->folder;
hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_REMOVE_FOLDERITEM;
hookdata.item = item;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
node = start_node;
hookdata.folder = folder;
hookdata.update_flags = FOLDER_ADD_FOLDER;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
hookdata.folder = folder;
hookdata.update_flags = FOLDER_REMOVE_FOLDER;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
{
GHashTable *pptable = (GHashTable *)data;
FolderItem *item = (FolderItem *)node->data;
-
+
folder_item_restore_persist_prefs(item, pptable);
folder_item_scan_full(item, FALSE);
return FALSE;
}
+static gboolean folder_restore_prefs_func(GNode *node, gpointer data)
+{
+ GHashTable *pptable = (GHashTable *)data;
+ FolderItem *item = (FolderItem *)node->data;
+
+ folder_item_restore_persist_prefs(item, pptable);
+
+ return FALSE;
+}
+
void folder_scan_tree(Folder *folder, gboolean rebuild)
{
GHashTable *pptable;
hookdata.folder = folder;
hookdata.update_flags = FOLDER_TREE_CHANGED;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
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);
-
- prefs_matcher_read_config();
-
- folder_write_list();
-}
-
-static gboolean folder_restore_prefs_func(GNode *node, gpointer data)
-{
- GHashTable *pptable = (GHashTable *)data;
- FolderItem *item = (FolderItem *)node->data;
-
- folder_item_restore_persist_prefs(item, pptable);
-
- return FALSE;
-}
-
-void folder_fast_scan_tree(Folder *folder)
-{
- GHashTable *pptable;
- FolderUpdateData hookdata;
-
- if (!folder->klass->scan_tree)
- return;
-
- pptable = folder_persist_prefs_new(folder);
-
- if (folder->klass->scan_tree(folder) < 0) {
- return;
- }
-
- hookdata.folder = folder;
- hookdata.update_flags = FOLDER_TREE_CHANGED;
- hookdata.item = NULL;
- hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+ if (rebuild)
+ g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
+ else
+ g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_restore_prefs_func, pptable);
- g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_restore_prefs_func, pptable);
folder_persist_prefs_free(pptable);
prefs_matcher_read_config();
hookdata.folder = new_item->folder;
hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDERITEM;
hookdata.item = new_item;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
hookdata2.folder = item->folder;
hookdata2.item = item;
+ hookdata2.item2 = NULL;
hookdata2.update_flags = FOLDER_RENAME_FOLDERITEM;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata2);
}
}
if ((folder_has_parent_of_type(item, F_OUTBOX) ||
folder_has_parent_of_type(item, F_QUEUE) ||
- folder_has_parent_of_type(item, F_DRAFT) ||
folder_has_parent_of_type(item, F_TRASH)) &&
(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
filemode = prefs->folder_chmod;
if (filemode & S_IRGRP) filemode |= S_IWGRP;
if (filemode & S_IROTH) filemode |= S_IWOTH;
- chmod(cache_file, filemode);
+ if (cache_file != NULL)
+ chmod(cache_file, filemode);
}
} else {
item->cache_dirty = FALSE;
FolderItem *next_item;
GNode *srcnode;
gchar *old_id, *new_id;
+ FolderUpdateData hookdata;
/* move messages */
debug_print("%s %s to %s\n", copy?"Copying":"Moving", src->path, dest->path);
log_message(LOG_PROTOCOL, copy ?_("Copying %s to %s...\n"):_("Moving %s to %s...\n"),
src->name, new_item->path);
- mlist = folder_item_get_msg_list(src);
-
- if (mlist != NULL) {
- if (copy)
- folder_item_copy_msgs(new_item, mlist);
- else
- folder_item_move_msgs(new_item, mlist);
- procmsg_msg_list_free(mlist);
- }
-
/*copy prefs*/
folder_item_prefs_copy_prefs(src, new_item);
new_item->sort_key = src->sort_key;
new_item->sort_type = src->sort_type;
+ mlist = folder_item_get_msg_list(src);
+
+ if (mlist != NULL) {
+ if (copy)
+ folder_item_copy_msgs(new_item, mlist);
+ else
+ folder_item_move_msgs(new_item, mlist);
+ procmsg_msg_list_free(mlist);
+ }
+
prefs_matcher_write_config();
/* recurse */
old_id = folder_item_get_identifier(src);
new_id = folder_item_get_identifier(new_item);
+ hookdata.folder = src->folder;
+ hookdata.update_flags = FOLDER_TREE_CHANGED | FOLDER_MOVE_FOLDERITEM;
+ hookdata.item = src;
+ hookdata.item2 = new_item;
+ hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+
/* if src supports removing, otherwise only copy folder */
if (src->folder->klass->remove_folder != NULL && !copy)
src->folder->klass->remove_folder(src->folder, src);
}
}
}
-
- if (msginfo->planned_download
- == POP3_PARTIAL_DLOAD_DELE) {
+ if (newmsginfo != NULL
+ && msginfo->planned_download == POP3_PARTIAL_DLOAD_DELE) {
partial_mark_for_delete(newmsginfo);
}
- if (msginfo->planned_download
- == POP3_PARTIAL_DLOAD_DLOAD) {
+ if (newmsginfo != NULL
+ && msginfo->planned_download == POP3_PARTIAL_DLOAD_DLOAD) {
partial_mark_for_download(newmsginfo);
}
if (!MSG_IS_POSTFILTERED (msginfo->flags)) {
real_list,
NULL);
}
- while (ret == 0 && real_list != NULL) {
- MsgInfo *msginfo = (MsgInfo *)real_list->data;
+ cur = real_list;
+ while (ret == 0 && cur != NULL) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
- real_list = real_list->next;
+ cur = cur->next;
continue;
}
if (!item->folder->klass->remove_msgs)
ret = folder_item_remove_msg(item, msginfo->msgnum);
if (ret != 0) break;
msgcache_remove_msg(item->cache, msginfo->msgnum);
- real_list = real_list->next;
+ cur = cur->next;
}
g_slist_free(real_list);
folder_item_scan_full(item, FALSE);
static gboolean folder_item_set_node(GNode *node, gpointer data)
{
+ cm_return_val_if_fail(node->data != NULL, -1);
+
FolderItem *item = (FolderItem *) node->data;
item->node = node;
#define TEMP_FOLDER "TEMP_FOLDER"
#define PROCESSING_FOLDER_ITEM "processing"
-static FolderItem *processing_folder_item;
-
-static void folder_create_processing_folder(void)
+static FolderItem *folder_create_processing_folder(int account_id)
{
- Folder *processing_folder;
- gchar *tmpname;
+ static Folder *processing_folder = NULL;
+ FolderItem *processing_folder_item;
+
+ gchar *processing_folder_item_name = NULL;
- if ((processing_folder = folder_find_from_name(TEMP_FOLDER, mh_get_class())) == NULL) {
- gchar *tmppath;
+ processing_folder_item_name = g_strdup_printf("%s-%d", PROCESSING_FOLDER_ITEM, account_id);
- tmppath =
+ if (processing_folder == NULL) {
+ gchar *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);
+ tmppath = NULL;
+
+ g_assert(processing_folder != NULL);
+ processing_folder->klass->scan_tree(processing_folder);
}
g_assert(processing_folder != NULL);
- debug_print("tmpparentroot %s\n", LOCAL_FOLDER(processing_folder)->rootpath);
- /* FIXME: [W32] The code below does not correctly merge
- relative filenames; there should be a function to handle
- this. */
- if (!is_relative_filename(LOCAL_FOLDER(processing_folder)->rootpath))
- 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(processing_folder)->rootpath,
- G_DIR_SEPARATOR_S, PROCESSING_FOLDER_ITEM,
- NULL);
-
- if (!is_dir_exist(tmpname)) {
- debug_print("*TMP* creating %s\n", tmpname);
+ processing_folder_item = folder_find_child_item_by_name(FOLDER_ITEM(processing_folder->node->data),
+ processing_folder_item_name);
+ if (processing_folder_item) {
+ debug_print("*TMP* already created %s\n", folder_item_get_path(processing_folder_item));
+ } else {
processing_folder_item = processing_folder->klass->create_folder(processing_folder,
processing_folder->node->data,
- PROCESSING_FOLDER_ITEM);
- } else {
- debug_print("*TMP* already created\n");
- 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);
- }
+ processing_folder_item_name);
+ folder_item_append(FOLDER_ITEM(processing_folder->node->data), processing_folder_item);
+ debug_print("*TMP* creating %s\n", folder_item_get_path(processing_folder_item));
+ }
+ g_free(processing_folder_item_name);
g_assert(processing_folder_item != NULL);
- g_free(tmpname);
+
+ return(processing_folder_item);
}
-FolderItem *folder_get_default_processing(void)
+FolderItem *folder_get_default_processing(int account_id)
{
- if (!processing_folder_item) {
- folder_create_processing_folder();
- }
- return processing_folder_item;
+ return folder_create_processing_folder(account_id);
}
/* folder_persist_prefs_new() - return hash table with persistent