/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
*
* 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <w32lib.h>
#endif
+#include "alertpanel.h"
#include "folder.h"
#include "session.h"
#include "inc.h"
#include "timing.h"
#include "compose.h"
#include "main.h"
+#include "msgcache.h"
+#include "privacy.h"
/* Dependecies to be removed ?! */
#include "prefs_common.h"
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);
}
}
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)
Folder *folder = NULL;
FolderItem *item;
- g_return_val_if_fail(klass != NULL, NULL);
+ cm_return_val_if_fail(klass != NULL, NULL);
name = name ? name : path;
folder = klass->new_folder(name, path);
void folder_init(Folder *folder, const gchar *name)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
folder_set_name(folder, name);
hookdata.folder = folder;
hookdata.update_flags = FOLDER_TREE_CHANGED;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
void folder_destroy(Folder *folder)
{
- g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->klass->destroy_folder != NULL);
+ cm_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder->klass->destroy_folder != NULL);
folder_remove(folder);
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;
-
- g_return_val_if_fail(folder != NULL, NULL);
-
+
+ cm_return_val_if_fail(folder != NULL, NULL);
+
if (folder->klass->item_new) {
item = folder->klass->item_new(folder);
} else {
item = g_new0(FolderItem, 1);
}
- g_return_val_if_fail(item != NULL, NULL);
+ 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->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();
void folder_item_append(FolderItem *parent, FolderItem *item)
{
- g_return_if_fail(parent != NULL);
- g_return_if_fail(parent->folder != NULL);
- g_return_if_fail(parent->node != NULL);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(parent != NULL);
+ cm_return_if_fail(parent->folder != NULL);
+ cm_return_if_fail(parent->node != NULL);
+ cm_return_if_fail(item != NULL);
item->folder = parent->folder;
g_node_append(parent->node, item->node);
{
GNode *node, *start_node;
FolderUpdateData hookdata;
- gchar *tags_file = NULL;
+ gchar *tags_file = NULL, *tags_dir = NULL;
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->folder->node != NULL);
+ cm_return_if_fail(item != NULL);
+ 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);
tags_file = folder_item_get_tags_file(item);
if (tags_file)
claws_unlink(tags_file);
+ tags_dir = g_path_get_dirname(tags_file);
+ if (tags_dir)
+ rmdir(tags_dir);
+
g_free(tags_file);
+ g_free(tags_dir);
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;
{
GNode *node, *next;
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- g_return_if_fail(item->node != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item->node != NULL);
node = item->node->children;
while (node != NULL) {
{
Folder *folder;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
folder = item->folder;
if (folder) {
FolderItem *folder_item_parent(FolderItem *item)
{
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->node != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->node != NULL, NULL);
if (item->node->parent == NULL)
return NULL;
item->threaded = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "hidereadmsgs"))
item->hide_read_msgs = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "hidedelmsgs"))
+ item->hide_del_msgs = *attr->value == '1' ? TRUE : FALSE;
+ else if (!strcmp(attr->name, "hidereadthreads"))
+ item->hide_read_threads = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "reqretrcpt"))
item->ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
else if (!strcmp(attr->name, "sort_key")) {
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")) {
xml_tag_add_attr(tag, xml_attr_new("thread_collapsed", item->thread_collapsed ? "1" : "0"));
xml_tag_add_attr(tag, xml_attr_new("threaded", item->threaded ? "1" : "0"));
xml_tag_add_attr(tag, xml_attr_new("hidereadmsgs", item->hide_read_msgs ? "1" : "0"));
+ xml_tag_add_attr(tag, xml_attr_new("hidedelmsgs", item->hide_del_msgs ? "1" : "0"));
+ xml_tag_add_attr(tag, xml_attr_new("hidereadthreads", item->hide_read_threads ? "1" : "0"));
if (item->ret_rcpt)
xml_tag_add_attr(tag, xml_attr_new("reqretrcpt", "1"));
void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
folder->ui_func = func;
folder->ui_func_data = data;
void folder_set_name(Folder *folder, const gchar *name)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
g_free(folder->name);
folder->name = name ? g_strdup(name) : NULL;
void folder_set_sort(Folder *folder, guint sort)
{
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if (folder->sort != sort) {
folder_remove(folder);
{
GNode *node;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
node = folder->node;
gint i;
FolderUpdateData hookdata;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if ((FOLDER_TYPE(folder) == F_IMAP ||
FOLDER_TYPE(folder) == F_NEWS) &&
hookdata.folder = folder;
hookdata.update_flags = FOLDER_ADD_FOLDER;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
{
FolderUpdateData hookdata;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
folder_list = g_list_remove(folder_list, folder);
hookdata.folder = folder;
hookdata.update_flags = FOLDER_REMOVE_FOLDER;
hookdata.item = NULL;
+ hookdata.item2 = NULL;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
}
xmlnode = node->data;
if (strcmp2(xmlnode->tag->tag, "folderlist") != 0) {
- g_warning("wrong folder list\n");
+ g_warning("wrong folder list");
xml_free_tree(node);
return -1;
}
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");
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();
{
FolderItem *new_item;
- g_return_val_if_fail(parent != NULL, NULL);
+ cm_return_val_if_fail(parent != NULL, NULL);
new_item = parent->folder->klass->create_folder(parent->folder, parent, name);
if (new_item) {
FolderUpdateData hookdata;
new_item->cache = msgcache_new();
+ new_item->cache_dirty = TRUE;
+ new_item->mark_dirty = TRUE;
+ new_item->tags_dirty = TRUE;
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);
}
{
gint retval;
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(newname != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(newname != NULL, -1);
retval = item->folder->klass->rename_folder(item->folder, item, newname);
hookdata2.folder = item->folder;
hookdata2.item = item;
+ hookdata2.item2 = NULL;
hookdata2.update_flags = FOLDER_RENAME_FOLDERITEM;
hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata2);
}
FolderItem *item;
struct FuncToAllFoldersData *function_data = (struct FuncToAllFoldersData *) data;
- g_return_val_if_fail(node->data != NULL, FALSE);
+ cm_return_val_if_fail(node->data != NULL, FALSE);
item = FOLDER_ITEM(node->data);
- g_return_val_if_fail(item != NULL, FALSE);
+ cm_return_val_if_fail(item != NULL, FALSE);
function_data->function(item, function_data->data);
struct TotalMsgStatus *status = (struct TotalMsgStatus *)data;
gchar *id;
- g_return_val_if_fail(node->data != NULL, FALSE);
+ cm_return_val_if_fail(node->data != NULL, FALSE);
item = FOLDER_ITEM(node->data);
folder = list ? list->data:NULL;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
d[0] = (gpointer)path;
d[1] = NULL;
folder = list ? list->data:NULL;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
d[0] = (gpointer)path;
d[1] = NULL;
FolderItem *child;
for (node = item->node->children; node != NULL; node = node->next) {
- gchar *base;
child = FOLDER_ITEM(node->data);
- base = g_path_get_basename(child->path);
- if (strcmp2(base, name) == 0) {
- g_free(base);
+ if (strcmp2(child->name, name) == 0) {
return child;
}
- g_free(base);
}
return NULL;
{
gchar *type_str;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
type_str = folder->klass->idstr;
return g_strconcat("#", type_str, "/", folder->name, NULL);
gchar *id = NULL;
gchar *folder_id = NULL;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->path == NULL)
return NULL;
return id;
}
+Folder *folder_find_from_identifier(const gchar *identifier)
+{
+ gchar *str;
+ gchar *p;
+ gchar *name;
+ FolderClass *class;
+
+ cm_return_val_if_fail(identifier != NULL, NULL);
+
+ if (*identifier != '#')
+ return NULL;
+
+ Xstrdup_a(str, identifier, return NULL);
+
+ p = strchr(str, '/');
+ if (!p)
+ return NULL;
+ *p = '\0';
+ p++;
+ class = folder_get_class_from_string(&str[1]);
+ if (class == NULL)
+ return NULL;
+
+ name = p;
+ p = strchr(p, '/');
+ if (p)
+ return NULL;
+
+ return folder_find_from_name(name, class);
+}
+
FolderItem *folder_find_item_from_identifier(const gchar *identifier)
{
Folder *folder;
gchar *path;
FolderClass *class;
- g_return_val_if_fail(identifier != NULL, NULL);
+ cm_return_val_if_fail(identifier != NULL, NULL);
if (*identifier != '#')
return folder_find_item_from_path(identifier);
return d[1];
}
+/** Returns the FolderItem from a given identifier
+ *
+ * The FolderItem is created if it doesn't already exist.
+ * If creation failed, the function returns NULL.
+ *
+ * Identifiers are of the form #type/Mailbox/FolderA/FolderB/FolderC
+ */
+FolderItem *folder_get_item_from_identifier(const gchar *identifier)
+{
+ FolderItem *item, *last_parent;
+ Folder *folder;
+ gchar *p1, *p2, *str;
+ size_t len;
+ FolderClass *class;
+ gboolean created_something = FALSE;
+
+ item = folder_find_item_from_identifier(identifier);
+ if(item)
+ return item;
+
+ /* trivial sanity check: need at least # and two slashes */
+ len = strlen(identifier);
+ if(len < 3)
+ return NULL;
+
+ /* make sure identifier ends with a slash */
+ if(identifier[len-1] == G_DIR_SEPARATOR) {
+ Xstrdup_a(str, identifier, return NULL);
+ }
+ else {
+ Xstrndup_a(str, identifier, len+1, return NULL);
+ str[len] = G_DIR_SEPARATOR;
+ }
+
+ /* find folder class */
+ p1 = strchr(str, G_DIR_SEPARATOR);
+ if(!p1)
+ return NULL;
+ *p1 = '\0';
+ class = folder_get_class_from_string(&str[1]);
+ if(!class)
+ return NULL;
+ *p1 = G_DIR_SEPARATOR;
+ ++p1;
+
+ /* find folder from class and name */
+ p2 = strchr(p1, G_DIR_SEPARATOR);
+ if(!p2)
+ return NULL;
+ *p2 = '\0';
+ folder = folder_find_from_name(p1, class);
+ if(!folder)
+ return NULL;
+ *p2 = G_DIR_SEPARATOR;
+ ++p2;
+ p1 = p2;
+
+ /* Now, move forward and make sure all sections in the path exist */
+ last_parent = folder->node->data;
+ while((p1 = strchr(p1, G_DIR_SEPARATOR)) != NULL) {
+ *p1 = '\0';
+ item = folder_find_item_from_identifier(str);
+ if(!item) {
+ item = folder_create_folder(last_parent, p2);
+ if(!item)
+ return NULL;
+ debug_print("Created folder '%s'\n", str);
+ created_something = TRUE;
+ if(prefs_common.inherit_folder_props && (last_parent != item->folder->node->data)) {
+ folder_item_prefs_copy_prefs(last_parent, item);
+ }
+ }
+ last_parent = item;
+ *p1 = G_DIR_SEPARATOR;
+ ++p1;
+ p2 = p1;
+ }
+
+ if(created_something)
+ folder_write_list();
+
+ return item;
+}
+
+
/**
* Get a displayable name for a FolderItem
*
{
gchar *name = NULL;
- g_return_val_if_fail(item != NULL, g_strdup(""));
+ cm_return_val_if_fail(item != NULL, g_strdup(""));
switch (item->stype) {
case F_INBOX:
folder = list->data;
if (FOLDER_TYPE(folder) != F_MH) continue;
rootitem = FOLDER_ITEM(folder->node->data);
- g_return_if_fail(rootitem != NULL);
+ cm_return_if_fail(rootitem != NULL);
if (folder->inbox && folder->outbox && folder->draft &&
folder->queue && folder->trash)
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;
}
{
Folder *folder;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
folder = item->folder;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
return folder->klass->item_get_path(folder, item);
}
static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
{
- GRelation *relation;
+ GHashTable *relation;
gint ret = 0;
GSList *cur;
if (item->no_select)
return 0;
- relation = g_relation_new(2);
- g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+ relation = g_hash_table_new(g_direct_hash, g_direct_equal);
if ((ret = item->folder->klass->get_flags(
item->folder, item, msglist, relation)) == 0) {
- GTuples *tuples;
+ gpointer data, old_key;
MsgInfo *msginfo;
MsgPermFlags permflags = 0;
- gboolean skip;
folder_item_update_freeze();
folder_item_set_batch(item, TRUE);
for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
msginfo = (MsgInfo *) cur->data;
- tuples = g_relation_select(relation, msginfo, 0);
- skip = tuples->len < 1;
- if (!skip)
- permflags = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
- g_tuples_destroy(tuples);
- if (skip)
- continue;
-
- if (msginfo->flags.perm_flags != permflags) {
- procmsg_msginfo_change_flags(msginfo,
- permflags & ~msginfo->flags.perm_flags, 0,
- ~permflags & msginfo->flags.perm_flags, 0);
+ if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data)) {
+ permflags = GPOINTER_TO_INT(data);
+
+ if (msginfo->flags.perm_flags != permflags) {
+ procmsg_msginfo_change_flags(msginfo,
+ permflags & ~msginfo->flags.perm_flags, 0,
+ ~permflags & msginfo->flags.perm_flags, 0);
+ }
}
}
folder_item_set_batch(item, FALSE);
folder_item_update_thaw();
}
- g_relation_destroy(relation);
+ g_hash_table_destroy(relation);
return ret;
}
GSList *cur;
gint ret = 0;
- g_return_val_if_fail(item != NULL, -1);
- g_return_val_if_fail(item->folder != NULL, -1);
- g_return_val_if_fail(item->folder->klass != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item->folder != NULL, -1);
+ cm_return_val_if_fail(item->folder->klass != NULL, -1);
if (item->no_select)
return -1;
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);
GSList *mlist, *cur;
Folder *folder;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
if (item->no_select)
return -1;
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();
gboolean update_flags = 0, old_uids_valid = FALSE;
GHashTable *subject_table = NULL;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
if (item->path == NULL) return -1;
folder = item->folder;
- g_return_val_if_fail(folder != NULL, -1);
- g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
item->scanning = ITEM_SCANNING_WITH_FLAGS;
if (item->cache)
msgcache_destroy(item->cache);
item->cache = msgcache_new();
+ item->cache_dirty = TRUE;
+ item->mark_dirty = TRUE;
+ item->tags_dirty = TRUE;
cache_list = NULL;
}
MsgInfo *msginfo;
msginfo = msgcache_get_msg(item->cache, folder_cur_num);
- if (folder->klass->is_msg_changed && folder->klass->is_msg_changed(folder, item, msginfo)) {
+ 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);
- } else {
+ } else if (msginfo) {
exists_list = g_slist_prepend(exists_list, msginfo);
if(prefs_common.thread_by_subject &&
}
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 (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);
gboolean folder_item_free_cache(FolderItem *item, gboolean force)
{
- g_return_val_if_fail(item != NULL, TRUE);
+ cm_return_val_if_fail(item != NULL, TRUE);
if (item->cache == NULL)
return TRUE;
{
Folder *folder = item->folder;
- g_return_if_fail(folder != NULL);
+ cm_return_if_fail(folder != NULL);
if (folder->klass->remove_cached_msg == NULL)
return;
static void folder_item_clean_local_files(FolderItem *item, gint days)
{
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(item->folder != NULL);
if (FOLDER_TYPE(item->folder) == F_IMAP ||
FOLDER_TYPE(item->folder) == F_NEWS) {
{
gchar *cache_file, *mark_file, *tags_file;
START_TIMING("");
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (item->path != NULL) {
cache_file = folder_item_get_cache_file(item);
mark_file = folder_item_get_mark_file(item);
tags_file = folder_item_get_tags_file(item);
item->cache = msgcache_read_cache(item, cache_file);
+ item->cache_dirty = FALSE;
+ item->mark_dirty = FALSE;
+ item->tags_dirty = FALSE;
if (!item->cache) {
MsgInfoList *list, *cur;
guint newcnt = 0, unreadcnt = 0;
MsgInfo *msginfo;
item->cache = msgcache_new();
+ item->cache_dirty = TRUE;
+ item->mark_dirty = TRUE;
+ item->tags_dirty = TRUE;
folder_item_scan_full(item, TRUE);
msgcache_read_mark(item->cache, mark_file);
g_free(tags_file);
} else {
item->cache = msgcache_new();
+ item->cache_dirty = TRUE;
+ item->mark_dirty = TRUE;
+ item->tags_dirty = TRUE;
}
+
END_TIMING();
folder_clean_cache_memory(item);
}
void folder_item_write_cache(FolderItem *item)
{
- gchar *cache_file, *mark_file, *tags_file;
+ gchar *cache_file = NULL, *mark_file = NULL, *tags_file = NULL;
FolderItemPrefs *prefs;
gint filemode = 0;
gchar *id;
return;
last_mtime = item->mtime;
- if (item->folder->klass->scan_required)
- need_scan = item->folder->klass->scan_required(item->folder, item);
- else
- need_scan = TRUE;
+ if (item->folder->klass->set_mtime) {
+ if (item->folder->klass->scan_required)
+ need_scan = item->folder->klass->scan_required(item->folder, item);
+ else
+ need_scan = TRUE;
+ }
id = folder_item_get_identifier(item);
debug_print("Save cache for folder %s\n", id);
g_free(id);
- cache_file = folder_item_get_cache_file(item);
- mark_file = folder_item_get_mark_file(item);
- tags_file = folder_item_get_tags_file(item);
+ if (item->cache_dirty)
+ cache_file = folder_item_get_cache_file(item);
+ if (item->cache_dirty || item->mark_dirty)
+ mark_file = folder_item_get_mark_file(item);
+ if (item->cache_dirty || item->tags_dirty)
+ tags_file = folder_item_get_tags_file(item);
if (msgcache_write(cache_file, mark_file, tags_file, item->cache) < 0) {
prefs = item->prefs;
if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
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;
+ item->mark_dirty = FALSE;
+ item->tags_dirty = FALSE;
+ }
if (!need_scan && item->folder->klass->set_mtime) {
if (item->mtime == last_mtime) {
MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
{
- Folder *folder;
MsgInfo *msginfo = NULL;
- g_return_val_if_fail(item != NULL, 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;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(msgid != NULL, NULL);
+ 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);
GSList *folder_item_get_msg_list(FolderItem *item)
{
- g_return_val_if_fail(item != NULL, NULL);
+ 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);
- g_return_val_if_fail(item->cache != NULL, NULL);
+ cm_return_val_if_fail(item->cache != NULL, NULL);
return msgcache_get_msg_list(item->cache);
}
MimeInfo *mimeinfo = node->data;
if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
- && (!mimeinfo->subtype || strcmp(mimeinfo->subtype, "pgp-signature"))) {
+ && (!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
+ strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
+ strcmp(mimeinfo->subtype, "pkcs7-signature")))) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
} else if (mimeinfo->disposition == DISPOSITIONTYPE_UNKNOWN &&
+ mimeinfo->id == NULL &&
mimeinfo->type != MIMETYPE_TEXT &&
mimeinfo->type != MIMETYPE_MULTIPART) {
if (!mimeinfo->subtype
- || strcmp(mimeinfo->subtype, "pgp-signature"))
+ || (strcmp(mimeinfo->subtype, "pgp-signature") &&
+ strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
+ strcmp(mimeinfo->subtype, "pkcs7-signature")))
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
} else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
- strcmp(mimeinfo->subtype, "pgp-signature") &&
+ mimeinfo->id == NULL &&
+ (strcmp(mimeinfo->subtype, "pgp-signature") &&
+ strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
+ strcmp(mimeinfo->subtype, "pkcs7-signature")) &&
(procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
gchar *msgfile;
MsgInfo *msginfo;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
folder = item->folder;
- g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
+ cm_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
if (item->no_select)
return NULL;
procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
}
}
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
return msgfile;
gchar *msgfile;
MsgInfo *msginfo;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
}
}
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
}
return msgfile;
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);
}
GSList file_list;
MsgFileInfo fileinfo;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(file != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(file != NULL, -1);
fileinfo.msginfo = NULL;
fileinfo.file = (gchar *)file;
Folder *folder;
gint ret, num, lastnum = -1;
GSList *file_cur;
- GRelation *relation;
+ GHashTable *relation;
MsgFileInfo *fileinfo = NULL;
gboolean folderscan = FALSE;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(file_list != NULL, -1);
- g_return_val_if_fail(dest->folder != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(file_list != NULL, -1);
+ cm_return_val_if_fail(dest->folder != NULL, -1);
if (dest->no_select)
return -1;
folder = dest->folder;
- relation = g_relation_new(2);
- g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
+ relation = g_hash_table_new(g_direct_hash, g_direct_equal);
if (folder->klass->add_msgs != NULL) {
ret = folder->klass->add_msgs(folder, dest, file_list, relation);
if (ret < 0) {
- g_relation_destroy(relation);
+ g_hash_table_destroy(relation);
return ret;
}
} else {
ret = folder->klass->add_msg(folder, dest, fileinfo->file, fileinfo->flags);
if (ret < 0) {
- g_relation_destroy(relation);
+ g_hash_table_destroy(relation);
return ret;
}
- g_relation_insert(relation, fileinfo, GINT_TO_POINTER(ret));
+ g_hash_table_insert(relation, fileinfo, GINT_TO_POINTER(ret));
}
}
for (file_cur = file_list; file_cur != NULL; file_cur = g_slist_next(file_cur)) {
- GTuples *tuples;
+ gpointer data, old_key;
fileinfo = (MsgFileInfo *) file_cur->data;
- tuples = g_relation_select(relation, fileinfo, 0);
- num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
- g_tuples_destroy(tuples);
+ if (g_hash_table_lookup_extended(relation, fileinfo, &old_key, &data))
+ num = GPOINTER_TO_INT(data);
+ else
+ num = -1;
if (num >= 0) {
MsgInfo *newmsginfo;
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);
}
}
}
- g_relation_destroy(relation);
+ g_hash_table_destroy(relation);
return lastnum;
}
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->threaded = src->threaded;
new_item->ret_rcpt = src->ret_rcpt;
new_item->hide_read_msgs = src->hide_read_msgs;
+ new_item->hide_del_msgs = src->hide_del_msgs;
+ new_item->hide_read_threads = src->hide_read_threads;
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);
-
src_identifier = folder_item_get_identifier(src);
dst_identifier = folder_item_get_identifier(dest);
return F_MOVE_OK;
}
+struct find_data
+{
+ gboolean found;
+};
+static void find_num(gpointer key, gpointer value, gpointer data)
+{
+ struct find_data *fdata = (struct find_data *)data;
+ if (GPOINTER_TO_INT(value) == 0)
+ fdata->found = TRUE;
+}
+
+static gboolean some_msgs_have_zero_num(GHashTable *hashtable)
+{
+ struct find_data fdata;
+
+ fdata.found = FALSE;
+ g_hash_table_foreach(hashtable, find_num, &fdata);
+
+ return fdata.found;
+}
+
/**
* Copy a list of message to a new folder and remove
* source messages if wanted
GSList *l;
gint num, lastnum = -1;
gboolean folderscan = FALSE;
- GRelation *relation;
+ GHashTable *relation;
GSList *not_moved = NULL;
gint total = 0, curmsg = 0;
MsgInfo *msginfo = NULL;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msglist != NULL, -1);
folder = dest->folder;
- g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
+ cm_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
if (dest->no_select)
return -1;
return queue_err ? -1:0;
}
- relation = g_relation_new(2);
- g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
- g_relation_index(relation, 1, g_direct_hash, g_direct_equal);
+ relation = g_hash_table_new(g_direct_hash, g_direct_equal);
for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
MsgInfo * msginfo = (MsgInfo *) l->data;
*/
if (folder->klass->copy_msgs != NULL) {
if (folder->klass->copy_msgs(folder, dest, msglist, relation) < 0) {
- g_relation_destroy(relation);
+ g_hash_table_destroy(relation);
return -1;
}
} else {
if (l != NULL) {
msginfo = (MsgInfo *) l->data;
if (msginfo != NULL && msginfo->folder == dest) {
- g_relation_destroy(relation);
+ g_hash_table_destroy(relation);
return -1;
}
}
num = folder->klass->copy_msg(folder, dest, msginfo);
if (num > 0)
- g_relation_insert(relation, msginfo, GINT_TO_POINTER(num));
+ g_hash_table_insert(relation, msginfo, GINT_TO_POINTER(num));
else
not_moved = g_slist_prepend(not_moved, msginfo);
}
relation);
}
for (l = msglist; l != NULL; l = g_slist_next(l)) {
- GTuples *tuples;
+ gpointer old_key, data;
msginfo = (MsgInfo *) l->data;
item = msginfo->folder;
- tuples = g_relation_select(relation, msginfo, 0);
- if (tuples) {
- if (tuples->len)
- num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
- else
- num = 0;
- g_tuples_destroy(tuples);
- } else {
- num = -1;
- }
+ if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data))
+ num = GPOINTER_TO_INT(data);
+ else
+ num = 0;
if (g_slist_find(not_moved, msginfo))
continue;
item->folder->klass->remove_msg(item->folder,
msginfo->folder,
msginfo->msgnum);
- remove_msginfo_from_cache(item, msginfo);
+ if (!item->folder->account || item->folder->account->imap_use_trash) {
+ remove_msginfo_from_cache(item, msginfo);
+ }
}
}
}
* Fetch new MsgInfos for new messages in dest folder,
* add them to the msgcache and update folder message counts
*/
- if (g_relation_count(relation, GINT_TO_POINTER(0), 1) > 0) {
+ if (some_msgs_have_zero_num(relation)) {
folder_item_scan_full(dest, FALSE);
folderscan = TRUE;
}
folder_item_set_batch(dest, TRUE);
for (l = msglist; l != NULL; l = g_slist_next(l)) {
MsgInfo *msginfo = (MsgInfo *) l->data;
- GTuples *tuples;
+ gpointer data, old_key;
- tuples = g_relation_select(relation, msginfo, 0);
- if (tuples->len > 0) {
- num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
- g_tuples_destroy(tuples);
- } else {
+ if (!msginfo)
+ continue;
+
+ if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data))
+ num = GPOINTER_TO_INT(data);
+ else
num = 0;
- if (tuples)
- g_tuples_destroy(tuples);
- }
+
statusbar_progress_all(curmsg++,total, 100);
if (curmsg % 100 == 0)
GTK_EVENTS_FLUSH();
}
}
}
-
- 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)) {
- procmsg_msginfo_set_flags ( msginfo, MSG_POSTFILTERED, 0);
- procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
- hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+ procmsg_msginfo_set_flags ( msginfo, MSG_POSTFILTERED, 0);
+ if (newmsginfo) {
+ procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
+ hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+ }
}
- procmsg_msginfo_free(newmsginfo);
+ procmsg_msginfo_free(&newmsginfo);
if (num > lastnum)
statusbar_progress_all(0,0,0);
statusbar_pop_all();
- g_relation_destroy(relation);
+ g_hash_table_destroy(relation);
if (not_moved != NULL) {
g_slist_free(not_moved);
return -1;
{
GSList list;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
list.data = msginfo;
list.next = NULL;
gint folder_item_move_msgs(FolderItem *dest, GSList *msglist)
{
gint result = -1;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msglist != NULL, -1);
inc_lock();
result = do_copy_msgs(dest, msglist, TRUE);
inc_unlock();
{
GSList list;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
list.data = msginfo;
list.next = NULL;
gint folder_item_copy_msgs(FolderItem *dest, GSList *msglist)
{
gint result;
- g_return_val_if_fail(dest != NULL, -1);
- g_return_val_if_fail(msglist != NULL, -1);
+ cm_return_val_if_fail(dest != NULL, -1);
+ cm_return_val_if_fail(msglist != NULL, -1);
inc_lock();
result = do_copy_msgs(dest, msglist, FALSE);
gint ret;
MsgInfo *msginfo;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
folder = item->folder;
- g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
+ cm_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
if (item->no_select)
return -1;
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 (msginfo != NULL) {
- remove_msginfo_from_cache(item, msginfo);
- procmsg_msginfo_free(msginfo);
+ 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);
+ }
}
return ret;
gint ret = 0;
GSList *real_list = NULL, *cur = NULL;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
folder = item->folder;
- g_return_val_if_fail(folder != NULL, -1);
+ cm_return_val_if_fail(folder != NULL, -1);
if (item->no_select)
return -1;
inc_lock();
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);
return ret;
}
+gint folder_item_expunge(FolderItem *item)
+{
+ Folder *folder = item->folder;
+ gint result = 0;
+ if (folder == NULL)
+ return -1;
+ if (folder->klass->expunge) {
+ GSList *msglist = folder_item_get_msg_list(item);
+ GSList *cur;
+ result = folder->klass->expunge(folder, item);
+ if (result == 0) {
+ for (cur = msglist; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ if (MSG_IS_DELETED(msginfo->flags)) {
+ remove_msginfo_from_cache(item, msginfo);
+ }
+ }
+ }
+ procmsg_msg_list_free(msglist);
+ }
+ return result;
+}
+
gint folder_item_remove_all_msg(FolderItem *item)
{
Folder *folder;
gint result;
- g_return_val_if_fail(item != NULL, -1);
+ cm_return_val_if_fail(item != NULL, -1);
if (item->no_select)
return -1;
if (result == 0) {
folder_item_free_cache(item, TRUE);
item->cache = msgcache_new();
+ item->cache_dirty = TRUE;
+ item->mark_dirty = TRUE;
+ item->tags_dirty = TRUE;
}
} else {
MsgInfoList *msglist;
void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
{
- g_return_if_fail(item != NULL);
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(item != NULL);
+ cm_return_if_fail(msginfo != NULL);
+
+ item->mark_dirty = TRUE;
+
if (item->no_select)
return;
if (!folder)
return;
+ item->tags_dirty = TRUE;
+
if (folder->klass->commit_tags == NULL)
return;
{
Folder *folder;
- g_return_val_if_fail(item != NULL, FALSE);
+ cm_return_val_if_fail(item != NULL, FALSE);
if (item->no_select)
return FALSE;
folder = item->folder;
- g_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
+ cm_return_val_if_fail(folder->klass->is_msg_changed != NULL, -1);
return folder->klass->is_msg_changed(folder, item, msginfo);
}
gchar *file;
gchar *old_file;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->path != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->path != NULL, NULL);
path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, NULL);
+ cm_return_val_if_fail(path != NULL, NULL);
if (!is_dir_exist(path))
make_dir_hier(path);
file = g_strconcat(path, G_DIR_SEPARATOR_S, CACHE_FILE, NULL);
gchar *file;
gchar *old_file;
- g_return_val_if_fail(item != NULL, NULL);
- g_return_val_if_fail(item->path != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item->path != NULL, NULL);
path = folder_item_get_path(item);
- g_return_val_if_fail(path != NULL, NULL);
+ cm_return_val_if_fail(path != NULL, NULL);
if (!is_dir_exist(path))
make_dir_hier(path);
file = g_strconcat(path, G_DIR_SEPARATOR_S, MARK_FILE, NULL);
* result when using another Claws mailbox from another install
* with different tags. */
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
identifier = folder_item_get_identifier(item);
- g_return_val_if_fail(identifier != NULL, NULL);
+ cm_return_val_if_fail(identifier != NULL, NULL);
#ifdef G_OS_WIN32
while (strchr(identifier, '/'))
#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);
Folder *folder = (Folder *) data;
FolderItem *item;
- g_return_val_if_fail(xmlnode != NULL, NULL);
- g_return_val_if_fail(folder != NULL, NULL);
+ 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");
+ g_warning("tag name != \"folderitem\"");
return NULL;
}
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;
FolderClass *klass = NULL;
GNode *cur;
- g_return_val_if_fail(node->data != NULL, NULL);
+ 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");
+ g_warning("tag name != \"folder\"");
return NULL;
}
list = xmlnode->tag->attr;
return NULL;
folder = folder_new(klass, "", "");
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
if (klass->set_xml)
klass->set_xml(folder, xmlnode->tag);
return folder;
}
-static gchar *folder_get_list_path(void)
+gchar *folder_get_list_path(void)
{
static gchar *filename = NULL;
FolderItem *item = (FolderItem *) nodedata;
XMLTag *tag;
- g_return_val_if_fail(item != NULL, NULL);
+ cm_return_val_if_fail(item != NULL, NULL);
if (item->folder->klass->item_get_xml != NULL)
tag = item->folder->klass->item_get_xml(item->folder, item);
XMLNode *xmlnode;
XMLTag *tag;
- g_return_val_if_fail(folder != NULL, NULL);
+ cm_return_val_if_fail(folder != NULL, NULL);
if (folder->klass->get_xml != NULL)
tag = folder->klass->get_xml(folder);
node = g_node_new(xmlnode);
- g_return_val_if_fail (folder->node != NULL, NULL);
+ cm_return_val_if_fail (folder->node != NULL, NULL);
if (folder->node->children) {
GNode *cur;
#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;
- if ((processing_folder = folder_find_from_name(TEMP_FOLDER, mh_get_class())) == NULL) {
- gchar *tmppath;
+ gchar *processing_folder_item_name = NULL;
- tmppath =
+ processing_folder_item_name = g_strdup_printf("%s-%d", PROCESSING_FOLDER_ITEM, account_id);
+
+ 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
{
GHashTable *pptable;
- g_return_val_if_fail(folder, NULL);
+ cm_return_val_if_fail(folder, NULL);
pptable = g_hash_table_new(g_str_hash, g_str_equal);
folder_get_persist_prefs_recursive(folder->node, pptable);
return pptable;
static void folder_persist_prefs_free(GHashTable *pptable)
{
- g_return_if_fail(pptable);
+ cm_return_if_fail(pptable);
g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
g_hash_table_destroy(pptable);
}
item->threaded = pp->threaded;
item->ret_rcpt = pp->ret_rcpt;
item->hide_read_msgs = pp->hide_read_msgs;
+ item->hide_del_msgs = pp->hide_del_msgs;
+ item->hide_read_threads = pp->hide_read_threads;
item->sort_key = pp->sort_key;
item->sort_type = pp->sort_type;
}
GNode *child, *cur;
gchar *id;
- g_return_if_fail(node != NULL);
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(node != NULL);
+ cm_return_if_fail(item != NULL);
/* NOTE: item->path == NULL means top level folder; not interesting
* to store preferences of that one. */
if (item->path) {
id = folder_item_get_identifier(item);
pp = g_new0(PersistPrefs, 1);
- g_return_if_fail(pp != NULL);
+ cm_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;
+ pp->hide_del_msgs = item->hide_del_msgs;
+ pp->hide_read_threads = item->hide_read_threads;
pp->sort_key = item->sort_key;
pp->sort_type = item->sort_type;
g_hash_table_insert(pptable, id, pp);
guint total = 0, curmsg = 0;
gint last_apply_per_account;
- g_return_if_fail(item != NULL);
+ cm_return_if_fail(item != NULL);
if (item->no_select)
return;
|| 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);
{
FolderItem *cur = item;
+ if (!item)
+ return FALSE;
/* if we already know it, make it short */
if (item->parent_stype != -1) {
return (item->parent_stype == type);
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++;
+
+ 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;
+ }
+#endif
+
+ return TRUE;
+}
projects / claws.git / blobdiff