diff -u evolution-rss-0.1.4/debian/changelog evolution-rss-0.1.4/debian/changelog --- evolution-rss-0.1.4/debian/changelog +++ evolution-rss-0.1.4/debian/changelog @@ -1,3 +1,10 @@ +evolution-rss (0.1.4-6ubuntu1) lucid; urgency=low + + * 04_inline-images.patch: fix bug where inline images in HTML e-mails + would go MIA when evolution-rss is installed. (LP: #452874) + + -- Jeremy Visser Wed, 27 Jan 2010 16:41:15 +1100 + evolution-rss (0.1.4-6) unstable; urgency=low * 03_recv_feeds.patch: new version of the patch, with a correct only in patch2: unchanged: --- evolution-rss-0.1.4.orig/debian/patches/04_inline-images.patch +++ evolution-rss-0.1.4/debian/patches/04_inline-images.patch @@ -0,0 +1,31 @@ +--- src/parser.c.orig 2010-01-27 16:36:59.707467378 +1100 ++++ src/parser.c 2010-01-27 16:38:09.229962739 +1100 +@@ -48,6 +48,8 @@ + xmlDoc *src = NULL; + xmlDoc *doc = NULL; + gchar *url, *tmpurl; ++ gchar *base_dir = rss_component_peek_base_directory(mail_component_peek()); ++ gchar *feed_dir; + + src = (xmlDoc *)parse_html_sux(html, len); + +@@ -56,8 +58,19 @@ + + doc = src; + ++ feed_dir = g_build_path("/", ++ base_dir, ++ "static", ++ "http", ++ NULL); ++ g_free(base_dir); ++ + while ((doc = (xmlDoc *)html_find((xmlNode *)doc, "img"))) { + if ((url = (gchar *)xmlGetProp((xmlNodePtr)doc, (xmlChar *)"src"))) { ++ if (strstr(url, feed_dir) == NULL) { ++ g_free(feed_dir); ++ return NULL; ++ } + tmpurl = camel_url_decode_path(strstr(url, "http:")); + xmlSetProp((xmlNodePtr)doc, (xmlChar *)"src", (xmlChar *)tmpurl); + g_free(tmpurl);