X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fplugins%2Frssyl%2Frssyl_deleted.c;h=6f3a06e9038fa2804fff3f19ef46d06930e7f6b7;hp=d77c0b00cf7246174bf66e7024e91f06f3206230;hb=a48d94d8f0c2ea1b4778d1d92c6758433b856c0c;hpb=5d65cf9f805b141f4862a7b9ffea427c64b32da0

diff --git a/src/plugins/rssyl/rssyl_deleted.c b/src/plugins/rssyl/rssyl_deleted.c
index d77c0b00c..6f3a06e90 100644
--- a/src/plugins/rssyl/rssyl_deleted.c
+++ b/src/plugins/rssyl/rssyl_deleted.c
@@ -104,8 +104,10 @@ GSList *rssyl_deleted_update(RFolderItem *ritem)
 
 	g_file_get_contents(deleted_file, &contents, NULL, &error);
 
-	if (error)
+	if (error) {
 		g_warning("GError: '%s'\n", error->message);
+		g_error_free(error);
+	}
 
 	if (contents != NULL) {
 		lines = strsplit_no_copy(contents, '\n');
@@ -170,20 +172,25 @@ static void rssyl_deleted_store_internal(GSList *deleted_items, const gchar *del
 {
 	FILE *f;
 
-	if (g_file_test(deleted_file, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
-		g_remove(deleted_file);
+	if (g_file_test(deleted_file, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+		if (g_remove(deleted_file) != 0) {
+			debug_print("RSSyl: Oops, couldn't delete '%s', bailing out\n",
+					deleted_file);
+			return;
+		}
+	}
 
 	if (g_slist_length(deleted_items) == 0)
 		return;
 
 	if ((f = g_fopen(deleted_file, "w")) == NULL) {
-		debug_print("RSSyl: Couldn't open '%s', ignoring.\n", deleted_file);
+		debug_print("RSSyl: Couldn't open '%s', bailing out.\n", deleted_file);
 		return;
 	}
 
 	g_slist_foreach(deleted_items, (GFunc)_store_one_deleted_item,
 			(gpointer)f);
-	
+
 	fclose(f);
 	debug_print("RSSyl: written and closed deletion file\n");
 }