[Commits] [SCM] claws branch, master, updated. 3.11.1-11-g723df44

[ticho at claws-mail.org]

The branch, master has been updated
       via  723df44ba2e39b3b54e2fa688281c55613430e56 (commit)
      from  b30726c617cf52f2fe2fe0b07113d9a07abed936 (commit)

Summary of changes:
 src/plugins/rssyl/rssyl.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 723df44ba2e39b3b54e2fa688281c55613430e56
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Nov 2 13:22:02 2014 +0100

    Revert "RSSyl: Lose the .deleted file on folder move for now" - it will work now, after last commit
    
    This reverts commit f59759b1ba4e3f02cd87450761da89059d645684.

diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index 120037c..0f9ac06 100644
--- a/src/plugins/rssyl/rssyl.c
+++ b/src/plugins/rssyl/rssyl.c
@@ -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);
 
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail