evolution-rss r367 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Sep  2 05:22:39 2008
New Revision: 367
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=367&view=rev

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

* src/rss.c: org_gnome_cooly_format_rss
fix for #550313: fix gtkhtml view with
dark theme

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

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Tue Sep  2 05:22:39 2008
@@ -34,6 +34,7 @@
 	* if necessary implement config code for evo 2.12
 	* fix recursivity on layer_find_pos
 	* fix annoying cursor jump when browsing through evo-rss folders
-	* try harder to get feeds images (check by size 0)
+	* try harder to get feeds images (check by size 0) provide a expiration mechanism
 	* provide predefined groups of feeds (OSS & co)
 	* evolution import rss add no. of retries
+	* fix images when replying

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Sep  2 05:22:39 2008
@@ -1898,14 +1898,19 @@
 		else
 			goto out;
 
+		camel_stream_printf (fstream,
+                             "<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
+                             emfh->frame_colour & 0xffffff, emfh->content_colour & 0xffffff, emfh->text_colour & 0xffffff);
 		camel_stream_printf(fstream,
-		 "<table border=1 width=\"100%%\" cellpadding=0 cellspacing=0><tr><td bgcolor=#ffffff>");
+		 "<table border=1 width=\"100%%\" cellpadding=0 cellspacing=0><tr><td>");
 		camel_stream_printf(fstream,
 		 "<table border=0 width=\"100%%\" cellspacing=4 cellpadding=4>");
    		camel_stream_printf(fstream,
-		 "<tr><td bgcolor=\"#ff00ff\"><b><font size=+1><a href=%s>%s</a></font></b></td></tr>", website, subject);
-     		camel_stream_printf(fstream, "</head></html><tr><td bgcolor=\"#00ffff\">%s</td>", buff);
-    		camel_stream_printf(fstream, "</tr></table></td></tr></table>");
+		 "<tr><td bgcolor=\"%06x\"><b><font size=+1><a href=%s>%s</a></font></b></td></tr>", 
+			emfh->content_colour & 0xEDECEB,
+			website, subject);
+     		camel_stream_printf(fstream, "</head></html><tr><td>%s</td>", buff);
+    		camel_stream_printf(fstream, "</tr></table></td></tr></table></div>");
 
 		g_free(subject);
 		g_string_free(content, 1);
@@ -1946,7 +1951,9 @@
 		camel_stream_printf(fstream, 
 		"<table border=0 width=\"100%%\" cellspacing=4 cellpadding=4><tr>");
      		camel_stream_printf(fstream,
-		 "<tr><td bgcolor=\"#EDECEB\"><b><font size=+1><a href=%s>%s</a></font></b></td></tr>", website, subject);
+		 "<tr><td bgcolor=\"%06x\"><b><font size=+1><a href=%s>%s</a></font></b></td></tr>", 
+				emfh->content_colour & 0xEDECEB,
+				website, subject);
      		camel_stream_printf (fstream, "<td>%s</td>", buff);
     		camel_stream_printf (fstream, "</tr></table></td></tr></table></div>");
 	}
@@ -1965,13 +1972,16 @@
 		g_free(addr);
 	return;
 fmerror:
+	camel_stream_printf (fstream,
+               "<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
+               emfh->frame_colour & 0xffffff, emfh->content_colour & 0xffffff, emfh->text_colour & 0xffffff);
 	camel_stream_printf (t->stream, 
-	"<table border=1 width=\"100%%\" cellpadding=0 cellspacing=0><tr><td bgcolor=#ffffff>");
+	"<table border=1 width=\"100%%\" cellpadding=0 cellspacing=0><tr><td>");
 	camel_stream_printf(t->stream, 
 	"<table border=0 width=\"100%%\" cellspacing=4 cellpadding=4><tr>");
      	camel_stream_printf (t->stream,
-	"<td bgcolor=\"#ffffff\">Cannot format email. Formatting error!</td>");
-    	camel_stream_printf (t->stream, "</tr></table></td></tr></table>");
+	"<td>Cannot format email. Formatting error!</td>");
+    	camel_stream_printf (t->stream, "</tr></table></td></tr></table></div>");
 	return;
 }