Merge lp:~tuxator/midori/rss092 into lp:midori

[Paweł Forysiuk]

Allow rss feeds with verion 0.92

[Cris Dywan (kalikiana)]

As far as I see RSS 0.9.2 requires that "description" can have a type argument but the feed panel doesn't recognize that. So that needs to be added.
There's a good comparison of the version differences here http://web.archive.org/web/20110726002019/http://diveintomark.org/archives/2004/02/04/incompatible-rss

review: Needs Fixing

[Cris Dywan (kalikiana)]

Correction, 0.92 is quite compatible to 2.0 as far as the feed panel goes. I accidentally mixed up 0.92 and 0.94 which is what has the additional type argument.

review: Approve

=== modified file 'extensions/feed-panel/feed-rss.c'
--- extensions/feed-panel/feed-rss.c	2010-07-14 22:06:15 +0000
+++ extensions/feed-panel/feed-rss.c	2013-07-18 14:18:29 +0000
@@ -25,7 +25,11 @@
     {
         if ((str = xmlGetProp (node, BAD_CAST "version")))
         {
-            valid = !xmlStrcmp (str, BAD_CAST "2.0");
+            if (!xmlStrcmp (str, BAD_CAST "2.0") || !xmlStrcmp (str, BAD_CAST "0.92"))
+                valid = TRUE;
+            else
+                valid = FALSE;
+
             xmlFree (str);
 
             if (valid)