/*
- * 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-2016 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
*
* 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 "main.h"
#include "msgcache.h"
#include "privacy.h"
+#include "prefs_common.h"
+#include "prefs_migration.h"
/* Dependecies to be removed ?! */
-#include "prefs_common.h"
#include "prefs_account.h"
/* Define possible missing constants for Windows. */
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)
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;
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
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);
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;
new_list = g_slist_prepend(new_list, GINT_TO_POINTER(msginfo->msgnum));
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;
}
}
tmp = folder_item_parent(tmp);
}
-
+
+ /* 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;
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();
}
}
}
processed_count++;
+ procmsg_msginfo_free(&msg);
+
if (progress_cb != NULL
&& !progress_cb(progress_data, FALSE, processed_count,
matched_count, msgcount))
projects / claws.git / blobdiff