Don't forget the ssl_verify_peer pref when migrating
[claws.git] / src / plugins / rssyl / rssyl_update_format.c
index 828445075e340150831fbb43b3d6a1eb7939a0f6..2b577dded9df4af4cc7c72a78998b05498a2bc91 100644 (file)
@@ -159,10 +159,17 @@ static void rssyl_update_format_func(FolderItem *item, gpointer data)
                                (of->fetch_comments != 0 ? TRUE : FALSE);
                        ritem->fetch_comments_max_age = of->fetch_comments_for;
                        ritem->silent_update = of->silent_update;
                                (of->fetch_comments != 0 ? TRUE : FALSE);
                        ritem->fetch_comments_max_age = of->fetch_comments_for;
                        ritem->silent_update = of->silent_update;
+                       ritem->ssl_verify_peer = of->ssl_verify_peer;
                }
 
                rssyl_update_format_move_contents(item, new_item);
 
                }
 
                rssyl_update_format_move_contents(item, new_item);
 
+               /* destroy the new folder's cache so we'll re-read the migrated one */
+               if (new_item->cache) {
+                       msgcache_destroy(new_item->cache);
+                       new_item->cache = NULL;
+               }
+
                /* Store folderlist with the new folder */
                folder_item_scan(new_item);
                folder_write_list();
                /* Store folderlist with the new folder */
                folder_item_scan(new_item);
                folder_write_list();
@@ -246,8 +253,9 @@ static void rssyl_update_format_move_contents(FolderItem *olditem,
                        oldpath, newpath);
 
        while ((fname = (gchar *)g_dir_read_name(d)) != NULL) {
                        oldpath, newpath);
 
        while ((fname = (gchar *)g_dir_read_name(d)) != NULL) {
+               gboolean migrate_file = to_number(fname) > 0 || strstr(fname, ".claws_") == fname;
                fpath = g_strconcat(oldpath, G_DIR_SEPARATOR_S, fname, NULL);
                fpath = g_strconcat(oldpath, G_DIR_SEPARATOR_S, fname, NULL);
-               if (to_number(fname) > 0 && g_file_test(fpath, G_FILE_TEST_IS_REGULAR)) {
+               if (migrate_file && g_file_test(fpath, G_FILE_TEST_IS_REGULAR)) {
                        nfpath = g_strconcat(newpath, G_DIR_SEPARATOR_S, fname, NULL);
                        move_file(fpath, nfpath, FALSE);
                        g_free(nfpath);
                        nfpath = g_strconcat(newpath, G_DIR_SEPARATOR_S, fname, NULL);
                        move_file(fpath, nfpath, FALSE);
                        g_free(nfpath);