Fixed two memory leaks when creating folderitems.

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index 52fc192efb9e579885214db29c2efeceec1c370c..902b990db42360689f4ef1160181ee10d2a046ca 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -36,6 +36,7 @@
 #include <w32lib.h>
 #endif
 
+#include "alertpanel.h"
 #include "folder.h"
 #include "session.h"
 #include "inc.h"
@@ -141,6 +142,7 @@ void folder_register_class(FolderClass *klass)
                                if (folder) {
                                        folder_add(folder);
                                        folder_unloaded_list = g_slist_remove(folder_unloaded_list, node);
+                                       xml_free_tree(node);
                                }
                                cur = NULL;
                                continue;
@@ -190,7 +192,7 @@ 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;
@@ -258,6 +260,7 @@ void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
@@ -300,7 +303,7 @@ void folder_set_xml(Folder *folder, XMLTag *tag)
 
                        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;
@@ -387,8 +390,8 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        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();
 
@@ -432,7 +435,6 @@ void folder_item_remove(FolderItem *item)
                }
        }
 
-       compose_list_update_folders(item, NULL);
        /* remove myself */
        if (item->cache != NULL) {
                msgcache_destroy(item->cache);
@@ -451,6 +453,7 @@ void folder_item_remove(FolderItem *item)
        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;
@@ -635,7 +638,7 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 
                        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")) {
@@ -794,6 +797,7 @@ void folder_add(Folder *folder)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_ADD_FOLDER;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
@@ -808,6 +812,7 @@ void folder_remove(Folder *folder)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_REMOVE_FOLDER;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 }
 
@@ -829,7 +834,7 @@ gint folder_read_list(void)
 
        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;
        }
@@ -870,7 +875,7 @@ void folder_write_list(void)
 
        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");
@@ -896,9 +901,9 @@ void folder_write_list(void)
 
        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);
 }
@@ -948,6 +953,7 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
        hookdata.item = NULL;
+       hookdata.item2 = NULL;
        hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
 
        if (rebuild)
@@ -980,6 +986,7 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
                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);
        }
 
@@ -1006,6 +1013,7 @@ gint folder_item_rename(FolderItem *item, gchar *newname)
 
                hookdata2.folder = item->folder;
                hookdata2.item = item;
+               hookdata2.item2 = NULL;
                hookdata2.update_flags = FOLDER_RENAME_FOLDERITEM;
                hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata2);
        }
@@ -1841,7 +1849,7 @@ void folder_set_missing_folders(void)
                        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;
                }
@@ -1974,8 +1982,9 @@ static gint folder_item_syncronize_flags(FolderItem *item)
        
        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);
 
@@ -2055,7 +2064,7 @@ gint folder_item_close(FolderItem *item)
                        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();
@@ -2276,7 +2285,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        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 if (msginfo) {
@@ -2311,7 +2320,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        }
        
        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);
@@ -2366,7 +2375,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                        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);
                        }
@@ -2443,7 +2452,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 
                totalcnt++;
 
-               procmsg_msginfo_free(msginfo);
+               procmsg_msginfo_free(&msginfo);
        }
        folder_item_set_batch(item, FALSE);
        g_slist_free(exists_list);
@@ -2740,7 +2749,8 @@ void folder_item_write_cache(FolderItem *item)
                        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;
@@ -2887,12 +2897,12 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
                        /* 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;
@@ -2934,12 +2944,12 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
                        /* 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;
@@ -2986,7 +2996,7 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
                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);
                }
@@ -3211,10 +3221,10 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
                        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);
                        }
                }
        }
@@ -3231,6 +3241,7 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        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);
@@ -3247,16 +3258,6 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        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);
        
@@ -3275,6 +3276,16 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        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 */
@@ -3293,7 +3304,11 @@ static FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest,
        old_id = folder_item_get_identifier(src);
        new_id = folder_item_get_identifier(new_item);
 
-       compose_list_update_folders(src, 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) 
@@ -3529,9 +3544,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                        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);
                        }
                }
        }
@@ -3594,13 +3607,12 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                        }
                                }
                        }
-
-                       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)) {
@@ -3610,7 +3622,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                        hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
                                }
                        }
-                       procmsg_msginfo_free(newmsginfo);
+                       procmsg_msginfo_free(&newmsginfo);
 
 
                        if (num > lastnum)
@@ -3719,17 +3731,15 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
 
        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;
@@ -4006,7 +4016,7 @@ static gchar *folder_item_get_tags_file(FolderItem *item)
 #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);
@@ -4031,11 +4041,12 @@ static gpointer xml_to_folder_item(gpointer nodedata, gpointer data)
        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;
        }
 
        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
@@ -4078,7 +4089,7 @@ static Folder *folder_get_from_xml(GNode *node)
 
        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;
@@ -4451,8 +4462,7 @@ void folder_item_apply_processing(FolderItem *item)
            || 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);
        
@@ -4800,3 +4810,19 @@ gint folder_item_search_msgs_local       (Folder                 *folder,
        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;
+}