evolution-rss r489 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Mar 31 17:33:35 2009
New Revision: 489
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=489&view=rev

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

* src/rss.c: (org_gnome_cooly_format_rss) - count comments

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

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Tue Mar 31 17:33:35 2009
@@ -61,3 +61,4 @@
 	* perhaps make quoted text fancier			   |
 	* if immage cannto be server from cache try to fetch it ---|
 	* disable filters on setup_feed()
+	* check s&r progress bar on Complete.

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Mar 31 17:33:35 2009
@@ -177,6 +177,8 @@
 gboolean inhibit_read = FALSE;	//prevent mail selection when deleting folder
 gboolean delete_op = FALSE;	//delete in progress
 gchar *commstream = NULL; 	//global comments stream
+guint commcnt = 0; 	//global number of comments
+gchar *commstatus = "";
 guint32 frame_colour;
 guint32 content_colour;
 guint32 text_colour;
@@ -1899,13 +1901,18 @@
 
 		if (comments) {
 			camel_stream_printf (fstream, 
-                        	"<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 10px; color: #%06x;\">"
-				"<b><font size=+1><a href=%s>Comments</font></b>", 
-                        	frame_colour & 0xffffff, content_colour & 0xffffff, text_colour & 0xffffff,
-				comments);
+                        	"<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
+				"<b><font size=+1><a href=%s>Comments</a></font></b>", 
+                        	frame_colour & 0xffffff, content_colour & 0xEDECEB & 0xffffff, text_colour & 0xffffff,
+				comments, commstatus);
 			if (commstream) {
-				camel_stream_printf(fstream, "%s", (gchar *)print_comments(comments, commstream));
-				commstream = NULL;
+				gchar *result = print_comments(comments, commstream);
+				if (commcnt) {
+					camel_stream_printf (fstream, 
+                        		"<b>(%d)</b> Refresh<div style=\"border: solid #%06x 0px; background-color: #%06x; padding: 10px; color: #%06x;\">%s",
+					commcnt, frame_colour & 0xffffff, content_colour & 0xffffff, text_colour & 0xffffff, result);
+					commstream = NULL;
+				}
 			}
 			else {
 				fetch_comments(comments, (CamelStream *)t->format);
@@ -4454,7 +4461,7 @@
 	return rfctmp;
 }
 
-gchar *
+static gchar *
 update_comments(RDF *r)
 {
         guint i;
@@ -4479,6 +4486,7 @@
                                 CF->body);
                 g_string_append_printf(comments, "</div>&nbsp;");
         }
+	commcnt=i;
         gchar *scomments=comments->str;
         g_string_free(comments, FALSE);
         return scomments;