RSSyl: Lose the .deleted file on folder move for now

diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 928d21c37577adf64a03921e046cbfaf4c463030..da71b585823578e4c9806fdb7bfcdac3420fd906 100644 (file)
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -808,7 +808,8 @@ static gboolean rssyl_subscribe_uri(Folder *folder, const gchar *uri)
 static void rssyl_copy_private_data(Folder *folder, FolderItem *oldi,
                FolderItem *newi)
 {
 static void rssyl_copy_private_data(Folder *folder, FolderItem *oldi,
                FolderItem *newi)
 {

-       gchar *dpathold, *dpathnew;
+       gchar *dpathold;
+/*     gchar *dpathnew;*/

        RFolderItem *olditem = (RFolderItem *)oldi,
                                                                        *newitem = (RFolderItem *)newi;
 
        RFolderItem *olditem = (RFolderItem *)oldi,
                                                                        *newitem = (RFolderItem *)newi;
 


@@ -846,11 +847,14 @@ 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);
 
        dpathold = g_strconcat(rssyl_item_get_path(oldi->folder, oldi),
                        G_DIR_SEPARATOR_S, RSSYL_DELETED_FILE, NULL);

-       dpathnew = g_strconcat(rssyl_item_get_path(newi->folder, newi),
-                       G_DIR_SEPARATOR_S, RSSYL_DELETED_FILE, NULL);
-       move_file(dpathold, dpathnew, TRUE);
+       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);
+       }

        g_free(dpathold);
        g_free(dpathold);

-       g_free(dpathnew);

 
 }
 
 
 }