evolution-rss r436 - trunk/src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Feb  6 07:26:34 2009
New Revision: 436
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=436&view=rev

Log:
2008-02-05  Lucian Langa  <lucilanga gnome org>

* src/parser.c: (parse_channel_line)
do not decode, parse, or fix images
if feed = comment
* src/parser.c: (layer_find_tag)
accept node->children->type == 3 (text)

Modified:
   trunk/src/parser.c
   trunk/src/rss.c

Modified: trunk/src/parser.c
==============================================================================
--- trunk/src/parser.c	(original)
+++ trunk/src/parser.c	Fri Feb  6 07:26:34 2009
@@ -492,14 +492,16 @@
                 if (strcasecmp (node->name, match)==0) {
                         if (node->children != NULL) {
 				if (node->children->type == 1			//XML_NODE_ELEMENT
-					|| node->children->type == 3		//XML_NODE_TEXT
+	/*			|| node->children->type == 3	*/		//XML_NODE_TEXT
 					|| node->children->next != NULL) {
 #ifdef RDF_DEBUG
 				g_print("NODE DUMP:%s|\n", xmlNodeGetContent(node->children->next));
+				
 #endif
 				len = xmlNodeDump(buf, node->doc, node->children, 0, 0);
 				content = g_strdup_printf("%s", xmlBufferContent(buf));
 				xmlBufferFree(buf);
+/*	content = xmlNodeGetContent(node->children);*/
 				return content;
                         	} else {
 					xmlBufferFree(buf);

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Feb  6 07:26:34 2009
@@ -1771,7 +1771,7 @@
 //			camel_stream_printf(fstream, 
 //				"<table border=0 width=\"100%%\" cellspacing=4 cellpadding=4>");
 			//camel_stream_printf (fstream, "<tr><td bgcolor=\"%06x\"><b><font size=+1><a href=%s>Comments</font></b></td></tr>", 
-			camel_stream_printf (fstream, "<tr><td><b><font size=+1><a href=%s>Comments:</font></b></td></tr>", 
+			camel_stream_printf (fstream, "<tr><td><b><font size=+1><a href=%s>Comments</font></b></td></tr>", 
 				comments);
 			if (commstream) {
 				camel_stream_printf(fstream, "%s", (gchar *)print_comments(comments, commstream));
@@ -4159,16 +4159,13 @@
         for (i=0; NULL != (el = g_array_index(r->item, xmlNodePtr, i)); i++) {
                 CF = parse_channel_line(el->children, NULL, NULL);
         ///print_cf(CF);
-//			g_string_append_printf (comments,
-//				"<br><div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
-//				frame_colour & 0xffffff, content_colour & 0xffffff, text_colour & 0xffffff);
                 g_string_append_printf(comments, "<tr><td><table cellpading=0 cellspacing=0 border=1 width=100%>");
                 g_string_append_printf(comments,
                         "<tr><td><table border=0 width=\"100%%\" cellspacing=2 cellpadding=0>");
 		g_string_append_printf (comments, "<tr><td bgcolor=\"%06x\"><table width=100%% cellspacing=2 cellspadding=0><tr><td><b><a href=%s>%s</b></td><td align=right>%s</td></tr></table></td></tr>", 
 				content_colour & 0xEDECEB & 0xffffff,
 				CF->website, CF->subj, CF->date);
-                g_string_append_printf(comments, "<tr><td colspan=2>%s</td></tr>", CF->body);
+                g_string_append_printf(comments, "<tr><td><table><tr><td colspan=2>%s</td></tr></table></td></tr>", CF->body);
                 g_string_append_printf(comments, "</table></td></tr>");
                 g_string_append_printf(comments, "</table></td></tr>");
         }