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

Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6276
Merged at revision: 6280
Proposed branch: lp:~tuxator/midori/rss092
Merge into: lp:midori
Diff against target: 16 lines (+5/-1)
1 file modified
extensions/feed-panel/feed-rss.c (+5/-1)
To merge this branch: bzr merge lp:~tuxator/midori/rss092
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+175578@code.launchpad.net

Commit message

Allow rss feeds with verion 0.92

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

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
Revision history for this message
Cris Dywan (kalikiana) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/feed-panel/feed-rss.c'
2--- extensions/feed-panel/feed-rss.c 2010-07-14 22:06:15 +0000
3+++ extensions/feed-panel/feed-rss.c 2013-07-18 14:18:29 +0000
4@@ -25,7 +25,11 @@
5 {
6 if ((str = xmlGetProp (node, BAD_CAST "version")))
7 {
8- valid = !xmlStrcmp (str, BAD_CAST "2.0");
9+ if (!xmlStrcmp (str, BAD_CAST "2.0") || !xmlStrcmp (str, BAD_CAST "0.92"))
10+ valid = TRUE;
11+ else
12+ valid = FALSE;
13+
14 xmlFree (str);
15
16 if (valid)

Subscribers

People subscribed via source and target branches

to all changes: