Fix a logic error introduced in previous commit.
[claws.git] / src / folder.c
index 4c7a045d89ecf133669a839f6d163e52904b30a8..081c4b1e2106956d42100394c68073a9e87cc5b0 100644 (file)
@@ -36,6 +36,7 @@
 #include <w32lib.h>
 #endif
 
+#include "alertpanel.h"
 #include "folder.h"
 #include "session.h"
 #include "inc.h"
@@ -169,6 +170,9 @@ void folder_unregister_class(FolderClass *klass)
                }
        }
        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)
@@ -255,6 +259,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);
 }
 
@@ -428,7 +433,7 @@ void folder_item_remove(FolderItem *item)
                        folder_item_remove(sub_item);
                }
        }
-       
+
        /* remove myself */
        if (item->cache != NULL) {
                msgcache_destroy(item->cache);
@@ -447,6 +452,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;
@@ -790,6 +796,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);
 }
 
@@ -804,6 +811,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);
 }
 
@@ -903,13 +911,23 @@ static gboolean folder_scan_tree_func(GNode *node, gpointer data)
 {
        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;
@@ -934,46 +952,14 @@ 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);
 
-       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();
@@ -999,6 +985,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);
        }
 
@@ -1025,6 +1012,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);
        }
@@ -2438,7 +2426,6 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                }
                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);
@@ -2760,7 +2747,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;
@@ -3251,6 +3239,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);
@@ -3267,16 +3256,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);
        
@@ -3295,6 +3274,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 */
@@ -3313,6 +3302,12 @@ 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);
 
+       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);
@@ -3612,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)) {
@@ -3784,17 +3778,18 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
                                                        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);
@@ -4262,56 +4257,40 @@ static gchar * folder_item_get_tree_identifier(FolderItem * item)
 
 static FolderItem *folder_create_processing_folder(int account_id)
 {
-       Folder *processing_folder;
+       static Folder *processing_folder = NULL;
        FolderItem *processing_folder_item;
-       gchar      *tmpname;
 
        gchar *processing_folder_item_name = NULL;
 
         processing_folder_item_name = g_strdup_printf("%s-%d", PROCESSING_FOLDER_ITEM, account_id);
 
-       if ((processing_folder = folder_find_from_name(TEMP_FOLDER, mh_get_class())) == NULL) {
-               gchar *tmppath;
-
-               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_name,
-                                     NULL);
-       else
-               tmpname = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                     LOCAL_FOLDER(processing_folder)->rootpath,
-                                     G_DIR_SEPARATOR_S, 
-                                     processing_folder_item_name,
-                                     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_name);
-       } else {
-               debug_print("*TMP* already created\n");
-               processing_folder_item = folder_item_new(processing_folder, processing_folder_item_name, processing_folder_item_name);
-               g_assert(processing_folder_item);
-               folder_item_append(processing_folder->node->data, processing_folder_item);
-       }
+               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);
 }
@@ -4833,3 +4812,15 @@ 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] == '.' || new_folder[strlen(name) - 1] == '.') {
+               alertpanel_error(_("A folder name cannot begin or end with a dot.");
+               return FALSE;
+       }
+#endif
+
+       return TRUE;
+}