Revert "RSSyl: Lose the .deleted file on folder move for now" - it will work now...
authorAndrej Kacian <ticho@claws-mail.org>
Sun, 2 Nov 2014 12:22:02 +0000 (13:22 +0100)
committerAndrej Kacian <ticho@claws-mail.org>
Sun, 2 Nov 2014 12:22:02 +0000 (13:22 +0100)
This reverts commit f59759b1ba4e3f02cd87450761da89059d645684.

src/plugins/rssyl/rssyl.c

index 120037c..0f9ac06 100644 (file)
@@ -829,8 +829,7 @@ static gboolean rssyl_subscribe_uri(Folder *folder, const gchar *uri)
 static void rssyl_copy_private_data(Folder *folder, FolderItem *oldi,
                FolderItem *newi)
 {
-       gchar *dpathold;
-/*     gchar *dpathnew;*/
+       gchar *dpathold, *dpathnew;
        RFolderItem *olditem = (RFolderItem *)oldi,
                                                                        *newitem = (RFolderItem *)newi;
 
@@ -868,14 +867,11 @@ static void rssyl_copy_private_data(Folder *folder, FolderItem *oldi,
 
        dpathold = g_strconcat(rssyl_item_get_path(oldi->folder, oldi),
                        G_DIR_SEPARATOR_S, RSSYL_DELETED_FILE, NULL);
-       if (is_file_exist(dpathold)) {
-/*             dpathnew = g_strconcat(rssyl_item_get_path(newi->folder, newi),
-                               G_DIR_SEPARATOR_S, RSSYL_DELETED_FILE, NULL);
-               move_file(dpathold, dpathnew, TRUE);
-               g_free(dpathnew);*/
-               g_remove(dpathold);
-       }
+       dpathnew = g_strconcat(rssyl_item_get_path(newi->folder, newi),
+                       G_DIR_SEPARATOR_S, RSSYL_DELETED_FILE, NULL);
+       move_file(dpathold, dpathnew, TRUE);
        g_free(dpathold);
+       g_free(dpathnew);
 
 }