[Commits] [SCM] claws branch, master, updated. 3.10.1-171-gf59759b

[ticho at claws-mail.org]

The branch, master has been updated
       via  f59759b1ba4e3f02cd87450761da89059d645684 (commit)
      from  53de074939d1bbf21b4b29897616c2c438dc34f7 (commit)

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


- Log -----------------------------------------------------------------
commit f59759b1ba4e3f02cd87450761da89059d645684
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun Oct 19 03:54:04 2014 +0200

    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 928d21c..da71b58 100644
--- 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)
 {
-	gchar *dpathold, *dpathnew;
+	gchar *dpathold;
+/*	gchar *dpathnew;*/
 	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);
-	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(dpathnew);
 
 }
 

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


hooks/post-receive
-- 
Claws Mail