Revert "RSSyl: Just copy all of the custom folderlist xml tags in copy_private_data...

This reverts commit dc8728ee3222dbe49cdac81e6dc72b2ba206a046.

diff --git a/src/plugins/rssyl/rssyl.c b/src/plugins/rssyl/rssyl.c
index ff4a35615a21e2afdfbafa7581b1c072cf84389d..c87fde95f137bf15d1ad225fe62c8e7724023b70 100644 (file)
--- 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)
 {
 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(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);
+       }

 }
 
 /************************************************************************/
 }
 
 /************************************************************************/