evolution-rss r439 - trunk/src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Feb  6 15:46:53 2009
New Revision: 439
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=439&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/src/parser.c
   trunk/src/rss.c
   trunk/src/rss.h

Modified: trunk/src/parser.c
==============================================================================
--- trunk/src/parser.c	(original)
+++ trunk/src/parser.c	Fri Feb  6 15:46:53 2009
@@ -663,7 +663,6 @@
 	GArray *item = g_array_new (TRUE, TRUE, sizeof (xmlNodePtr));
 	char *t;
 	char *charset;
-	gchar *img_src = NULL;
 
 	/* check in-memory encoding first, fallback to transport encoding, which may or may not be correct */
 	if (r->cache->charset == XML_CHAR_ENCODING_UTF8
@@ -764,7 +763,7 @@
 		return NULL;
 	}
 	if (image != NULL)
-		img_src = layer_find(image->children, "url", NULL);
+		r->image = layer_find(image->children, "url", NULL);
 
 	t = g_strdup(get_real_channel_name(r->uri, NULL));
 	//feed might be added with no validation
@@ -790,8 +789,6 @@
 	else
 		r->ttl = 0;
 
-	update_feed_image(img_src, gen_md5(r->uri));
-
 	//items might not have a date
 	// so try to grab channel/feed date
 	gchar *md2 = g_strdup(layer_find(channel->children, "date", 

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Feb  6 15:46:53 2009
@@ -4194,6 +4194,7 @@
 {
 	xmlNodePtr root = xmlDocGetRootElement (r->cache);
 	if (tree_walk (root, r)) {
+		update_feed_image(r->image, gen_md5(r->uri));
 		r->feedid = update_channel(r);
 		if (r->maindate)
 			g_free(r->maindate);

Modified: trunk/src/rss.h
==============================================================================
--- trunk/src/rss.h	(original)
+++ trunk/src/rss.h	Fri Feb  6 15:46:53 2009
@@ -51,6 +51,7 @@
 	gchar		*title;		//title of the feed
 	gchar		*maindate;	//channel date
 	GArray		*item;		//feed content
+	gchar		*image;		//feed image
 	GtkWidget	*progress;
 	guint		total;		//total articles
 	guint		ttl;		//feed specified refresh interval