From: Dale Whittaker <dayul@users.sf.net>
Date: Sun, 16 Aug 2009 21:33:21 +0000 (+0200)
Subject: Catch another case of feed markup not being converted to text
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=883007c05d323b032fa91b7b838aa7a962e8be55;p=midori

Catch another case of feed markup not being converted to text
---

diff --git a/extensions/feed-panel/feed-parse.c b/extensions/feed-panel/feed-parse.c
index 1c2cd3f3..e2931b7c 100644
--- a/extensions/feed-panel/feed-parse.c
+++ b/extensions/feed-panel/feed-parse.c
@@ -29,7 +29,6 @@ feed_get_element_string (FeedParser* fparser)
          */
         return g_strdup (" ");
     }
-
     return (gchar*)xmlNodeListGetString (fparser->doc, node->children, 1);
 }
 
@@ -74,6 +73,14 @@ gchar*
 feed_get_element_markup (FeedParser* fparser)
 {
     gchar* markup;
+    xmlNodePtr node = fparser->node;
+
+    if (node->children &&
+        !xmlIsBlankNode (node->children) &&
+        node->children->type == XML_ELEMENT_NODE)
+    {
+        return (gchar*) xmlNodeGetContent (node->children);
+    }
 
     markup = feed_get_element_string (fparser);
     return feed_remove_markup (markup);