evolution-rss r437 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Feb  6 14:52:50 2009
New Revision: 437
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=437&view=rev

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

* src/rss.c: (org_gnome_cooly_article_show)
allow update of current_uid if delete in
progress
* src/parser.c: (layer_find_tag)
revert to parsing elements of node type

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

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri Feb  6 14:52:50 2009
@@ -47,3 +47,4 @@
         * implement right-click in browser
 	* category posted under
 	* coments updatable
+	* current_uid might be updated when were in delete mode

Modified: trunk/src/parser.c
==============================================================================
--- trunk/src/parser.c	(original)
+++ trunk/src/parser.c	Fri Feb  6 14:52:50 2009
@@ -351,6 +351,9 @@
         return NULL;
 }
 
+/* returns node disregarding type
+ */
+
 static char *
 layer_find (xmlNodePtr node, 
 	    char *match, 
@@ -385,8 +388,6 @@
 gchar *
 content_rss(xmlNode *node, gchar *fail)
 {
-	//guint len=0;
-	//xmlBufferPtr buf = xmlBufferCreate();
 	gchar *content;
 
 	content = xmlNodeGetContent(node);
@@ -394,15 +395,6 @@
 		return content;
 	else
 		return fail;
-/*	len = xmlNodeDump(buf, node->doc, node->children->next, 0, 0);
-	if (len)
-	{
-		content = g_strdup_printf("%s", xmlBufferContent(buf));
-		xmlBufferFree(buf);
-		return content;
-	}
-	else
-		return fail;*/
 }
 
 void
@@ -462,6 +454,7 @@
 	return fail;
 }
 
+/* find matching tag (with html entities) */
 static char *
 layer_find_tag (xmlNodePtr node,
             char *match,
@@ -492,16 +485,17 @@
                 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);
+/*this looses html entities
+ *				len = xmlNodeDump(buf, node->doc, node->children, 0, 0);
 				content = g_strdup_printf("%s", xmlBufferContent(buf));
-				xmlBufferFree(buf);
-/*	content = xmlNodeGetContent(node->children);*/
+				xmlBufferFree(buf);*/
+				content = xmlNodeGetContent(node->children);
 				return content;
                         	} else {
 					xmlBufferFree(buf);
@@ -874,8 +868,9 @@
 				layer_find_tag (top, "content", 
 					layer_find_tag (top, "summary", 
 					NULL)));
-
-		if (!b)
+		if (b) 
+			b = g_strstrip(b);
+		else
 	               	b = g_strdup(layer_find (top, "description",
 				layer_find (top, "content",
 				layer_find (top, "summary", "No information"))));

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Feb  6 14:52:50 2009
@@ -175,6 +175,7 @@
 
 rssfeed *rf = NULL;
 gboolean inhibit_read = FALSE;	//prevent mail selection when deleting folder
+gboolean delete_op = FALSE;	//delete in progress
 gchar *commstream = NULL; 	//global comments stream
 guint32 frame_colour;
 guint32 content_colour;
@@ -1875,7 +1876,7 @@
 #ifdef EVOLUTION_2_12
 void org_gnome_cooly_article_show(void *ep, EMEventTargetMessage *t)
 {
-	if (rf && !inhibit_read)
+	if (rf && (!inhibit_read || !delete_op))
 		rf->current_uid = g_strdup(t->uid);
 }
 #else
@@ -2507,7 +2508,6 @@
 	if (!commstream)
 		reload = 1;
 
-	g_print("response:%s\n", response->str);
 	commstream = response->str; 
 	if (reload)
 		em_format_redraw((EMFormat *)user_data);
@@ -4158,14 +4158,14 @@
         GString *comments = g_string_new(NULL);
         for (i=0; NULL != (el = g_array_index(r->item, xmlNodePtr, i)); i++) {
                 CF = parse_channel_line(el->children, NULL, NULL);
-        ///print_cf(CF);
+        //print_cf(CF);
                 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>");
+                        "<tr><td><table width=\"100%%\" cellspacing=0 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><table><tr><td colspan=2>%s</td></tr></table></td></tr>", CF->body);
+                g_string_append_printf(comments, "<tr><td><table cellpadding=3 cellspacing=3><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>");
         }