evolution-rss r453 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Mar  9 08:53:44 2009
New Revision: 453
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=453&view=rev

Log:
2009-03-08  Lucian Langa  <lucilanga gnome org>

* src/evolution-rss.schemas.in: correct ambigous description for
remove_folder entry

** Fix for bug #573914

* src/rss.c: (org_gnome_cooly_format_rss) - use <div> for displaying
articles in order to correctly display article on dark themes

Modified:
   trunk/ChangeLog
   trunk/src/evolution-rss.schemas.in
   trunk/src/rss.c

Modified: trunk/src/evolution-rss.schemas.in
==============================================================================
--- trunk/src/evolution-rss.schemas.in	(original)
+++ trunk/src/evolution-rss.schemas.in	Mon Mar  9 08:53:44 2009
@@ -193,9 +193,9 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-        <short>Remove Rename Folder</short>
+        <short>Remove feed folder</short>
         <long>
-    	    When deleting a folder also remove rename feed alocation.
+		Deleting feed entry will also remove feed folder.
         </long>
       </locale>
     </schema>

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon Mar  9 08:53:44 2009
@@ -888,7 +888,7 @@
 	
 }*/
 
-static void
+/*static void
 enable_html_cb(GtkCellRendererToggle *cell,
                gchar *path_str,
                gpointer data)
@@ -932,7 +932,7 @@
 			g_hash_table_lookup(rf->hre, lookup_key(name)) ? _("Disable") : _("Enable"));
 		g_free(name);
         }
-}
+}*/
 
 static void
 start_check_cb (GtkWidget *widget, gpointer data)
@@ -1758,25 +1758,31 @@
 ///		buff=tmp;
 
 		camel_stream_printf (fstream,
-			"<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n",
-			frame_colour & 0xffffff, content_colour & 0xffffff, text_colour & 0xffffff);
-		camel_stream_printf(fstream, 
-			"<table border=0 width=\"100%%\" cellspacing=2 cellpadding=1>");
-     		camel_stream_printf(fstream,
-			"<tr><td valign=top bgcolor=\"%06x\"><img src=/usr/share/evolution/2.24/images/rss-16.png>"
-			"<b><font size=+1><a href=%s>%s</a></font></b></td></tr>", 
-			content_colour & 0xEDECEB & 0xffffff,
-			website, subject);
-		if (category)
-			camel_stream_printf(fstream,
-				"<tr><td bgcolor=\"%06x\"><b><font size=-1>Posted under: %s</font></b></td></tr>", 
-				content_colour & 0xEDECEB & 0xffffff,
-				category);
-     		camel_stream_printf (fstream, "<tr><td><table width=\"100%%\" cellpading=2 cellspaing=2>"
-					"<tr><td><font colour=#%06x>%s</font></td></tr></table></td></tr>",
-					 text_colour & 0xffffff, buff);
+                        "<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 2px; color: #%06x;\">",
+                        frame_colour & 0xffffff, content_colour & 0xEDECEB & 0xffffff, text_colour & 0xffffff);
+                camel_stream_printf (fstream,
+                        "<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
+                        "<img src=/usr/share/evolution/2.24/images/rss-16.png>"
+                        "<b><font size=+1><a href=%s>%s</a></font></b></div>",
+                        frame_colour & 0xffffff, content_colour & 0xEDECEB & 0xffffff, text_colour & 0xffffff,
+                        website, subject);
+                if (category)
+                        camel_stream_printf(fstream,
+                                "<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
+                                "<b><font size=-1>Posted under: %s</font></b></div>",
+                                frame_colour & 0xffffff, content_colour & 0xEDECEB & 0xffffff, text_colour & 0xffffff,
+                                category);
+                camel_stream_printf (fstream, "<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 10px; color: #%06x;\">"
+                                "<font colour=#%06x>%s</font></div>",
+                        	frame_colour & 0xffffff, content_colour & 0xffffff, text_colour & 0xffffff,
+                                text_colour & 0xffffff, buff);
+		g_print("frame col:%x content %x text:%x\n", frame_colour, content_colour, text_colour);
+
 		if (comments) {
-			camel_stream_printf (fstream, "<tr><td><b><font size=+1><a href=%s>Comments</font></b></td></tr>", 
+			camel_stream_printf (fstream, 
+                        	"<div style=\"border: solid #%06x 0px; background-color: #%06x; color: #%06x;\">"
+				"<b><font size=+1><a href=%s>Comments</font></b>", 
+                        	frame_colour & 0xffffff, content_colour & 0xffffff, text_colour & 0xffffff,
 				comments);
 			if (commstream) {
 				camel_stream_printf(fstream, "%s", (gchar *)print_comments(comments, commstream));
@@ -1787,6 +1793,7 @@
 			}
 			camel_stream_printf (fstream, "</table></div>");
 		}	
+                camel_stream_printf (fstream, "</div>");
 	}
 
 	//this is required for proper charset rendering when html