/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2020 the Claws Mail team and 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
#include <w32lib.h>
#endif
+#include "alertpanel.h"
#include "folder.h"
#include "session.h"
#include "inc.h"
#include "main.h"
#include "msgcache.h"
#include "privacy.h"
+#include "prefs_common.h"
+#include "prefs_migration.h"
+#include "file-utils.h"
/* Dependecies to be removed ?! */
-#include "prefs_common.h"
#include "prefs_account.h"
/* Define possible missing constants for Windows. */
static gchar *folder_item_get_cache_file (FolderItem *item);
static gchar *folder_item_get_mark_file (FolderItem *item);
static gchar *folder_item_get_tags_file (FolderItem *item);
-static gchar *folder_get_list_path (void);
static GNode *folder_get_xml_node (Folder *folder);
static Folder *folder_get_from_xml (GNode *node);
static void folder_update_op_count_rec (GNode *node);
if (folder) {
folder_add(folder);
folder_unloaded_list = g_slist_remove(folder_unloaded_list, node);
+ xml_free_tree(node);
}
cur = NULL;
continue;
}
}
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)
return NULL;
}
item->folder = folder;
- folder->node = item->node = g_node_new(item);
+ folder->node = item->node;
folder->data = NULL;
return folder;
hookdata.folder = folder;
hookdata.update_flags = FOLDER_TREE_CHANGED;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
account = account_find_from_id(atoi(attr->value));
if (!account)
- g_warning("account_id: %s not found\n", attr->value);
+ g_warning("account_id: %s not found", attr->value);
else {
folder->account = account;
account->folder = folder;
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;
item->no_sub = FALSE;
item->no_select = FALSE;
item->collapsed = FALSE;
- item->thread_collapsed = FALSE;
- item->threaded = TRUE;
+ item->thread_collapsed = prefs_common.folder_default_thread_collapsed;
+ item->threaded = prefs_common.folder_default_thread;
+ item->hide_read_threads = prefs_common.folder_default_hide_read_threads;
+ item->hide_read_msgs = prefs_common.folder_default_hide_read_msgs;
+ item->hide_del_msgs = prefs_common.folder_default_hide_del_msgs;
item->ret_rcpt = FALSE;
item->opened = FALSE;
item->node = g_node_new(item);
item->data = NULL;
item->parent_stype = -1;
- item->sort_key = SORT_BY_DATE;
- item->sort_type = SORT_ASCENDING;
+ item->sort_key = prefs_common.default_sort_key;
+ item->sort_type = prefs_common.default_sort_type;
item->prefs = folder_item_prefs_new();
cm_return_if_fail(item->folder != NULL);
cm_return_if_fail(item->folder->node != NULL);
- start_node = node = item->node;
+ start_node = item->node;
node = item->folder->node;
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;
account = account_find_from_id(atoi(attr->value));
if (!account)
- g_warning("account_id: %s not found\n", attr->value);
+ g_warning("account_id: %s not found", attr->value);
else
item->account = account;
} else if (!strcmp(attr->name, "apply_sub")) {
item->last_seen = 0;
}
}
+ /* options without meaning in drafts */
+ if (item->stype == F_DRAFT)
+ item->hide_read_msgs =
+ item->hide_del_msgs =
+ item->hide_read_threads = FALSE;
}
XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
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);
}
GNode *node, *cur;
XMLNode *xmlnode;
gchar *path;
+ GList *list;
+ gint config_version = -1;
path = folder_get_list_path();
if (!is_file_exist(path)) return -1;
if (!node) return -1;
xmlnode = node->data;
- if (strcmp2(xmlnode->tag->tag, "folderlist") != 0) {
- g_warning("wrong folder list\n");
+ if (g_strcmp0(xmlnode->tag->tag, "folderlist") != 0) {
+ g_warning("wrong folder list");
xml_free_tree(node);
return -1;
}
cur = cur->next;
}
+ for (list = xmlnode->tag->attr; list != NULL; list = list->next) {
+ XMLAttr *attr = list->data;
+
+ if (!attr || !attr->name || !attr->value) continue;
+ if (!strcmp(attr->name, "config_version")) {
+ config_version = atoi(attr->value);
+ debug_print("Found folderlist config_version %d\n", config_version);
+ }
+ }
+
xml_free_tree(node);
+
+ if (prefs_update_config_version_folderlist(config_version) < 0) {
+ debug_print("Folderlist configuration file version upgrade failed\n");
+ return -2;
+ }
+
if (folder_list || folder_unloaded_list)
return 0;
else
if (xml_file_put_xml_decl(pfile->fp) < 0) {
prefs_file_close_revert(pfile);
- g_warning("failed to start write folder list.\n");
+ g_warning("failed to start write folder list.");
return;
}
tag = xml_tag_new("folderlist");
+ xml_tag_add_attr(tag, xml_attr_new_int("config_version",
+ CLAWS_CONFIG_VERSION));
xmlnode = xml_node_new(tag, NULL);
if (xml_write_tree(rootnode, pfile->fp) < 0) {
prefs_file_close_revert(pfile);
- g_warning("failed to write folder list.\n");
+ g_warning("failed to write folder list.");
} else if (prefs_file_close(pfile) < 0) {
- g_warning("failed to write folder list.\n");
+ g_warning("failed to write folder list.");
}
xml_free_tree(rootnode);
}
{
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);
}
for (list = folder_list; list != NULL; list = list->next) {
folder = list->data;
if (folder->klass == klass &&
- strcmp2(name, folder->name) == 0)
+ g_strcmp0(name, folder->name) == 0)
return folder;
}
for (node = item->node->children; node != NULL; node = node->next) {
child = FOLDER_ITEM(node->data);
- if (strcmp2(child->name, name) == 0) {
+ if (g_strcmp0(child->name, name) == 0) {
return child;
}
}
switch (item->stype) {
case F_INBOX:
- name = g_strdup(!strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
+ name = g_strdup(!g_strcmp0(item->name, INBOX_DIR) ? _("Inbox") :
item->name);
break;
case F_OUTBOX:
- name = g_strdup(!strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
+ name = g_strdup(!g_strcmp0(item->name, OUTBOX_DIR) ? _("Sent") :
item->name);
break;
case F_QUEUE:
- name = g_strdup(!strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
+ name = g_strdup(!g_strcmp0(item->name, QUEUE_DIR) ? _("Queue") :
item->name);
break;
case F_TRASH:
- name = g_strdup(!strcmp2(item->name, TRASH_DIR) ? _("Trash") :
+ name = g_strdup(!g_strcmp0(item->name, TRASH_DIR) ? _("Trash") :
item->name);
break;
case F_DRAFT:
- name = g_strdup(!strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
+ name = g_strdup(!g_strcmp0(item->name, DRAFT_DIR) ? _("Drafts") :
item->name);
break;
default:
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))
+ item->path && !g_strcmp0(item->name, item->path))
name = get_abbrev_newsgroup_name
(item->path,
prefs_common.ng_abbrev_len);
continue;
if (folder->klass->create_tree(folder) < 0) {
- g_warning("%s: can't create the folder tree.\n",
+ g_warning("%s: can't create the folder tree.",
LOCAL_FOLDER(folder)->rootpath);
continue;
}
ret = syncronize_flags(item, msglist);
- for (cur = msglist; cur != NULL; cur = g_slist_next(cur))
- procmsg_msginfo_free((MsgInfo *) cur->data);
+ for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+ procmsg_msginfo_free((MsgInfo **)&(cur->data));
+ }
g_slist_free(msglist);
msginfo = (MsgInfo *) cur->data;
if (MSG_IS_NEW(msginfo->flags))
procmsg_msginfo_unset_flags(msginfo, MSG_NEW, 0);
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
g_slist_free(mlist);
folder_item_update_thaw();
cache_list_last = g_slist_last(cache_list);
cache_max_num = ((MsgInfo *)cache_list_last->data)->msgnum;
} else {
- cache_cur_num = G_MAXINT;
+ cache_cur_num = G_MAXUINT;
cache_max_num = 0;
}
if (folder_list_cur != NULL) {
GSList *folder_list_last;
- folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+ folder_cur_num = GPOINTER_TO_UINT(folder_list_cur->data);
folder_list_last = g_slist_last(folder_list);
- folder_max_num = GPOINTER_TO_INT(folder_list_last->data);
+ folder_max_num = GPOINTER_TO_UINT(folder_list_last->data);
} else {
- folder_cur_num = G_MAXINT;
+ folder_cur_num = G_MAXUINT;
folder_max_num = 0;
}
- while ((cache_cur_num != G_MAXINT) || (folder_cur_num != G_MAXINT)) {
+ while ((cache_cur_num != G_MAXUINT) || (folder_cur_num != G_MAXUINT)) {
/*
* Message only exists in the folder
* Remember message for fetching
}
if (add) {
- new_list = g_slist_prepend(new_list, GINT_TO_POINTER(folder_cur_num));
- debug_print("Remembered message %d for fetching\n", folder_cur_num);
+ new_list = g_slist_prepend(new_list, GUINT_TO_POINTER(folder_cur_num));
+ debug_print("Remembered message %u for fetching\n", folder_cur_num);
}
/* Move to next folder number */
folder_list_cur = folder_list_cur->next;
if (folder_list_cur != NULL)
- folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+ folder_cur_num = GPOINTER_TO_UINT(folder_list_cur->data);
else
- folder_cur_num = G_MAXINT;
+ folder_cur_num = G_MAXUINT;
continue;
}
*/
if (cache_cur_num < folder_cur_num) {
msgcache_remove_msg(item->cache, cache_cur_num);
- debug_print("Removed message %d from cache.\n", cache_cur_num);
+ debug_print("Removed message %u from cache.\n", cache_cur_num);
/* Move to next cache number */
if (cache_list_cur)
if (cache_list_cur != NULL)
cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
else
- cache_cur_num = G_MAXINT;
+ cache_cur_num = G_MAXUINT;
update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
if (msginfo && 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);
+ procmsg_msginfo_free(&msginfo);
- debug_print("Remembering message %d to update...\n", folder_cur_num);
+ debug_print("Remembering message %u to update...\n", folder_cur_num);
} else if (msginfo) {
exists_list = g_slist_prepend(exists_list, msginfo);
if (cache_list_cur != NULL)
cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
else
- cache_cur_num = G_MAXINT;
+ cache_cur_num = G_MAXUINT;
if (folder_list_cur != NULL)
- folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+ folder_cur_num = GPOINTER_TO_UINT(folder_list_cur->data);
else
- folder_cur_num = G_MAXINT;
+ folder_cur_num = G_MAXUINT;
continue;
}
}
for(cache_list_cur = cache_list; cache_list_cur != NULL; cache_list_cur = g_slist_next(cache_list_cur))
- procmsg_msginfo_free((MsgInfo *) cache_list_cur->data);
+ procmsg_msginfo_free((MsgInfo **)&(cache_list_cur->data));
g_slist_free(cache_list);
g_slist_free(folder_list);
if (newmsg_list != NULL) {
GSList *elem, *to_filter = NULL;
gboolean do_filter = (filtering == TRUE) &&
- (item->stype == F_INBOX) &&
- (item->folder->account != NULL) &&
- (item->folder->account->filter_on_recv);
-
+ (item->folder->account != NULL) &&
+ (item->folder->account->filter_on_recv) &&
+ ((item->stype == F_INBOX) ||
+ ((item->stype == F_NORMAL) &&
+ (FOLDER_TYPE(item->folder) == F_NEWS)));
+
for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
MsgInfo *msginfo = (MsgInfo *) elem->data;
if (to_filter != NULL) {
for (elem = to_filter; elem; elem = g_slist_next(elem)) {
MsgInfo *msginfo = (MsgInfo *)elem->data;
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
g_slist_free(to_filter);
}
}
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);
totalcnt++;
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
folder_item_set_batch(item, FALSE);
g_slist_free(exists_list);
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;
MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
{
- Folder *folder;
MsgInfo *msginfo = NULL;
cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
- folder = item->folder;
if (!item->cache)
folder_item_read_cache(item);
MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
{
- Folder *folder;
MsgInfo *msginfo;
cm_return_val_if_fail(item != NULL, NULL);
cm_return_val_if_fail(msgid != NULL, NULL);
if (item->no_select)
- return FALSE;
+ return NULL;
- folder = item->folder;
if (!item->cache)
folder_item_read_cache(item);
{
cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
- return FALSE;
+ return NULL;
if (item->cache == 0)
folder_item_read_cache(item);
/* check for attachments */
if (mimeinfo != NULL) {
g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
- procmime_mimeinfo_free_all(mimeinfo);
+ procmime_mimeinfo_free_all(&mimeinfo);
procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
}
}
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
return msgfile;
/* check for attachments */
if (mimeinfo != NULL) {
g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_mime_flags, msginfo);
- procmime_mimeinfo_free_all(mimeinfo);
+ procmime_mimeinfo_free_all(&mimeinfo);
procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
}
}
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
return msgfile;
gint msgnum = 0;
gchar buf[BUFFSIZE];
- if ((fp = g_fopen(file, "rb")) == NULL)
+ if ((fp = claws_fopen(file, "rb")) == NULL)
return 0;
if ((folder_has_parent_of_type(dest, F_QUEUE)) ||
(folder_has_parent_of_type(dest, F_DRAFT)))
- while (fgets(buf, sizeof(buf), fp) != NULL) {
+ while (claws_fgets(buf, sizeof(buf), fp) != NULL) {
/* new way */
if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
strlen("X-Claws-End-Special-Headers:"))) ||
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);
+ procmsg_msginfo_free(&msginfo);
debug_print("found message as uid %d\n", msgnum);
}
g_free(hentry[0].body);
hentry[0].body = NULL;
- fclose(fp);
+ claws_fclose(fp);
return msgnum;
}
if (!folderscan &&
((newmsginfo = get_msginfo(dest, num)) != NULL)) {
add_msginfo_to_cache(dest, newmsginfo, NULL);
- procmsg_msginfo_free(newmsginfo);
+ procmsg_msginfo_free(&newmsginfo);
} else if ((newmsginfo = msgcache_get_msg(dest->cache, num)) != NULL) {
/* TODO: set default flags */
- procmsg_msginfo_free(newmsginfo);
+ procmsg_msginfo_free(&newmsginfo);
}
}
}
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);
}
tmp = folder_item_parent(tmp);
}
-
- tmp = folder_item_parent(src);
-
+
+ /* both dst and src can be root folders */
src_identifier = folder_item_get_identifier(src);
+ if (src_identifier == NULL && src->folder && folder_item_parent(src) == NULL) {
+ src_identifier = folder_get_identifier(src->folder);
+ }
+
dst_identifier = folder_item_get_identifier(dest);
-
if(dst_identifier == NULL && dest->folder && folder_item_parent(dest) == NULL) {
- /* dest can be a root folder */
dst_identifier = folder_get_identifier(dest->folder);
}
+
if (src_identifier == NULL || dst_identifier == NULL) {
debug_print("Can't get identifiers\n");
return F_MOVE_FAILED;
for (; cur; cur = cur->next) {
Compose *compose = NULL;
FolderItem *queue = dest;
- int val = 0;
+ ComposeQueueResult val = COMPOSE_QUEUE_SUCCESS;
msginfo = (MsgInfo *)cur->data;
compose = compose_reedit(msginfo, TRUE);
}
val = compose_queue(compose, NULL, &queue, NULL,
FALSE);
- if (val < 0) {
+ if (val != COMPOSE_QUEUE_SUCCESS) {
queue_err = TRUE;
} else if (remove_source) {
folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
}
- if (val == 0)
+ if (val == COMPOSE_QUEUE_SUCCESS)
compose_close(compose);
}
return queue_err ? -1:0;
item->folder->klass->remove_msg(item->folder,
msginfo->folder,
msginfo->msgnum);
- if (!item->folder->account || item->folder->account->imap_use_trash) {
- remove_msginfo_from_cache(item, msginfo);
- }
+ remove_msginfo_from_cache(item, msginfo);
}
}
}
}
}
}
-
- 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)) {
hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
}
}
- procmsg_msginfo_free(newmsginfo);
+ procmsg_msginfo_free(&newmsginfo);
if (num > lastnum)
msginfo = msgcache_get_msg(item->cache, num);
if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
return -1;
}
ret = folder->klass->remove_msg(folder, item, num);
- if (!item->folder->account || item->folder->account->imap_use_trash) {
- if (msginfo != NULL) {
- if (ret == 0)
- remove_msginfo_from_cache(item, msginfo);
- procmsg_msginfo_free(msginfo);
- }
+ if (msginfo != NULL) {
+ if (ret == 0)
+ remove_msginfo_from_cache(item, msginfo);
+ procmsg_msginfo_free(&msginfo);
}
return ret;
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);
#endif
path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
- "tagsdb", G_DIR_SEPARATOR_S,
+ TAGS_DIR, G_DIR_SEPARATOR_S,
identifier, NULL);
g_free(identifier);
cm_return_val_if_fail(xmlnode != NULL, NULL);
cm_return_val_if_fail(folder != NULL, NULL);
- if (strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
- g_warning("tag name != \"folderitem\"\n");
+ if (g_strcmp0(xmlnode->tag->tag, "folderitem") != 0) {
+ g_warning("tag name != \"folderitem\"");
return NULL;
}
item = folder_item_new(folder, "", "");
+ g_node_destroy(item->node);
if (folder->klass->item_set_xml != NULL)
folder->klass->item_set_xml(folder, item, xmlnode->tag);
else
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;
cm_return_val_if_fail(node->data != NULL, NULL);
xmlnode = node->data;
- if (strcmp2(xmlnode->tag->tag, "folder") != 0) {
- g_warning("tag name != \"folder\"\n");
+ if (g_strcmp0(xmlnode->tag->tag, "folder") != 0) {
+ g_warning("tag name != \"folder\"");
return NULL;
}
list = xmlnode->tag->attr;
return folder;
}
-static gchar *folder_get_list_path(void)
+gchar *folder_get_list_path(void)
{
static gchar *filename = NULL;
#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
processing_list = item->prefs->processing;
- if (!pre_global_processing && !processing_list
- && !post_global_processing)
+ if (!processing_enabled(pre_global_processing) &&
+ !processing_enabled(processing_list) &&
+ !processing_enabled(post_global_processing))
return;
debug_print("processing %s\n", item->name);
|| post_global_processing)
filtering_move_and_copy_msgs(mlist);
for (cur = mlist ; cur != NULL ; cur = cur->next) {
- MsgInfo * msginfo = (MsgInfo *)cur->data;
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free((MsgInfo **)&(cur->data));
}
g_slist_free(mlist);
if (!item)
return;
if (item->prefs->offlinesync && item->folder->klass->synchronise) {
- statuswindow_print_all(_("Synchronising %s for offline use...\n"), item->path ? item->path : "(null)");
+ statusbar_print_all(_("Synchronising %s for offline use...\n"), item->path ? item->path : "(null)");
item->folder->klass->synchronise(item,
item->prefs->offlinesync_days);
if (item->prefs->offlinesync_days > 0 &&
item->prefs->remove_old_bodies)
folder_item_clean_local_files(item, item->prefs->offlinesync_days);
- statuswindow_pop_all();
+ statusbar_pop_all();
}
}
return FALSE;
}
+gboolean folder_is_child_of(FolderItem *item, FolderItem *parent)
+{
+ if (item == NULL || parent == NULL)
+ return FALSE;
+
+ while (item != NULL) {
+ if (parent == item)
+ return TRUE;
+
+ item = folder_item_parent(item);
+ }
+
+ return FALSE;
+}
+
+
gboolean folder_subscribe (const gchar *uri)
{
GList *cur;
folder->klass->get_sort_type(folder, sort_key, sort_type);
return TRUE;
}
+
+gint folder_item_search_msgs (Folder *folder,
+ FolderItem *container,
+ MsgNumberList **msgs,
+ gboolean *on_server,
+ MatcherList *predicate,
+ SearchProgressNotify progress_cb,
+ gpointer progress_data)
+{
+ gint result = -1;
+
+ folder_item_update_freeze();
+
+ if (folder->klass->search_msgs)
+ result = folder->klass->search_msgs(folder, container,
+ msgs, on_server, predicate, progress_cb, progress_data);
+ if (result < 0)
+ result = folder_item_search_msgs_local(folder, container,
+ msgs, on_server, predicate, progress_cb, progress_data);
+
+ folder_item_update_thaw();
+
+ return result;
+}
+
+MsgNumberList *folder_item_get_number_list(FolderItem *item)
+{
+ GSList *nums = NULL;
+ GSList *msglist = folder_item_get_msg_list(item);
+
+ nums = procmsg_get_number_list_for_msgs(msglist);
+ procmsg_msg_list_free(msglist);
+
+ return nums;
+}
+
+gint folder_item_search_msgs_local (Folder *folder,
+ FolderItem *container,
+ MsgNumberList **msgs,
+ gboolean *on_server,
+ MatcherList *predicate,
+ SearchProgressNotify progress_cb,
+ gpointer progress_data)
+{
+ GSList *result = NULL;
+ GSList *cur = NULL;
+ gint matched_count = 0;
+ guint processed_count = 0;
+ gint msgcount;
+ GSList *nums = NULL;
+
+ if (*msgs == NULL) {
+ nums = folder_item_get_number_list(container);
+ } else {
+ nums = *msgs;
+ }
+
+ msgcount = g_slist_length(nums);
+
+ if (msgcount < 0)
+ return -1;
+
+ for (cur = nums; cur != NULL; cur = cur->next) {
+ guint msgnum = GPOINTER_TO_UINT(cur->data);
+ MsgInfo *msg = folder_item_get_msginfo(container, msgnum);
+
+ if (msg == NULL) {
+ g_slist_free(result);
+ return -1;
+ }
+
+ if (matcherlist_match(predicate, msg)) {
+ result = g_slist_prepend(result, GUINT_TO_POINTER(msg->msgnum));
+ matched_count++;
+ }
+ processed_count++;
+
+ procmsg_msginfo_free(&msg);
+
+ if (progress_cb != NULL
+ && !progress_cb(progress_data, FALSE, processed_count,
+ matched_count, msgcount))
+ break;
+ }
+
+ g_slist_free(nums);
+ *msgs = g_slist_reverse(result);
+
+ return matched_count;
+}
+
+/* Tests if a local (on disk) folder name is acceptable. */
+gboolean folder_local_name_ok(const gchar *name)
+{
+#ifdef G_OS_WIN32
+ if (name[0] == '.' || name[strlen(name) - 1] == '.') {
+ alertpanel_error(_("A folder name cannot begin or end with a dot."));
+ return FALSE;
+ }
+ if (name[strlen(name) - 1] == ' ') {
+ alertpanel_error(_("A folder name can not end with a space."));
+ return FALSE;
+ }
+#endif
+
+ return TRUE;
+}
projects / claws.git / blobdiff