talons

commit 532c08a452e0b8c11a818442b814832d15594022
parent c6dc3e229f361f11ab4920d84bb11b5821bc4e86
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Sat, 18 Oct 2014 13:18:17 +0200

Revert "RSSyl: Just copy all of the custom folderlist xml tags in copy_private_data via folder_item_{get,set}_xml class functions, instead of handling feed properties one by one."

This reverts commit dc8728ee3222dbe49cdac81e6dc72b2ba206a046.

Diffstat:
M
src/plugins/rssyl/rssyl.c
 | 
17
+++++++++++++----

1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
@@ -807,13 +807,22 @@ static gboolean rssyl_subscribe_uri(Folder *folder, const gchar *uri)
 static void rssyl_copy_private_data(Folder *folder, FolderItem *oldi,
 		FolderItem *newi)
 {
+	RFolderItem *olditem = (RFolderItem *)oldi,
+									*newitem = (RFolderItem *)newi;
+
 	g_return_if_fail(folder != NULL);
-	g_return_if_fail(oldi != NULL);
-	g_return_if_fail(newi != NULL);
+	g_return_if_fail(olditem != NULL);
+	g_return_if_fail(newitem != NULL);
 
-	rssyl_item_set_xml(newi->folder, newi,
-			rssyl_item_get_xml(folder, oldi));
+	if( olditem->url != NULL ) {
+		g_free(newitem->url);
+		newitem->url = g_strdup(olditem->url);
+	}
 
+	if( olditem->official_title != NULL ) {
+		g_free(newitem->official_title);
+		newitem->official_title = g_strdup(olditem->official_title);
+	}
 }
 
 /************************************************************************/