evolution-rss r479 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Mar 27 19:21:26 2009
New Revision: 479
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=479&view=rev

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

* src/rss.c,src/parser.c: - misc code cleanups

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/network-soup.c
   trunk/src/parser.c
   trunk/src/rss-config-factory.c
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri Mar 27 19:21:26 2009
@@ -52,10 +52,7 @@
 	* add icon to feed setup panel
 	* add handling parser error to setup_feed (check HIG for error msg)
 	* handle slash categories
-	* add feed logo in title
-	* use favico if feed does not provide an icon
 	* hook update in the properties  of folder
-	* search favicon in the subdomain->domain
 	* use combo popup for moving and placement of feed folders
 	* trigger resync after folder rename
 	* check webbuttons for webkit

Modified: trunk/src/network-soup.c
==============================================================================
--- trunk/src/network-soup.c	(original)
+++ trunk/src/network-soup.c	Fri Mar 27 19:21:26 2009
@@ -406,7 +406,7 @@
 	SoupURI *suri = NULL;
 #endif
 	SoupMessage *req = NULL;
-	guint response = NULL;
+	guint response = 0;
 	SoupSession *soup_sess = NULL;
 	GSList *headers;
 
@@ -640,6 +640,6 @@
 void
 rss_soup_init(void)
 {
-  //      SoupCookieJar *soup_jar;
-//        soup_jar = soup_cookie_jar_sqlite_new ("/home/cooly/.newcookies.sqlite", TRUE);
+ //       SoupCookieJar *soup_jar;
+//      soup_jar = soup_cookie_jar_sqlite_new ("/home/cooly/.newcookies.sqlite", TRUE);
 }

Modified: trunk/src/parser.c
==============================================================================
--- trunk/src/parser.c	(original)
+++ trunk/src/parser.c	Fri Mar 27 19:21:26 2009
@@ -391,7 +391,7 @@
 /* returns all matched nodes disregarding type
  */
 
-static char *
+GList *
 layer_find_all (xmlNodePtr node, 
 	    char *match, 
 	    char *fail)
@@ -416,7 +416,7 @@
 		return category;
 	else {
 		g_list_free(category);
-		return fail;
+		return (GList *)fail;
 	}
 }
 
@@ -441,7 +441,7 @@
 		return fail;
 }
 
-void
+gchar *
 dublin_core_rss(xmlNode *node, gchar *fail)
 {
 	gchar *content;

Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c	(original)
+++ trunk/src/rss-config-factory.c	Fri Mar 27 19:21:26 2009
@@ -378,7 +378,7 @@
 	GtkWidget *radiobutton5 = (GtkWidget *)glade_xml_get_widget (gui, "ttl");
 	GtkWidget *radiobutton6 = (GtkWidget *)glade_xml_get_widget (gui, "ttl_disabled");
 	GtkWidget *ttl_value = (GtkWidget *)glade_xml_get_widget (gui, "ttl_value");
-	gtk_spin_button_set_range(ttl_value, 0, MAX_TTL);
+	gtk_spin_button_set_range((GtkSpinButton *)ttl_value, 0, (guint)MAX_TTL);
 
   	switch (del_feed)
   	{

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Mar 27 19:21:26 2009
@@ -205,11 +205,12 @@
 #endif
 static void
 #if LIBSOUP_VERSION < 2003000
-finish_create_image (SoupMessage *msg, CamelStream *user_data);
+finish_create_image (SoupMessage *msg, gchar *user_data);
 #else
-finish_create_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data);
+finish_create_image (SoupSession *soup_sess, SoupMessage *msg, gchar *user_data);
 #endif
 gchar *get_main_folder(void);
+void fetch_comments(gchar *url, CamelStream *stream);
 
 struct _MailComponentPrivate {
         GMutex *lock;
@@ -1794,11 +1795,16 @@
 				g_object_unref(pixbuf);
 				goto render_body;
 			}
+		gchar *iconfile = g_build_filename (EVOLUTION_ICONDIR,
+                                            "rss-16.png",
+                                                NULL);
       		camel_stream_printf (fstream,
                        	"<div style=\"border: solid 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
+                        "<img height=16 src=%s>"
                        	"<b><font size=+1><a href=%s>%s</a></font></b></div>",
 			content_colour & 0xEDECEB & 0xffffff, text_colour & 0xffffff,
-                       	website, subject);
+                       	iconfile, website, subject);
+		g_free(iconfile);
 render_body:    if (category)
                         camel_stream_printf(fstream,
                                 "<div style=\"border: solid 0px; background-color: #%06x; padding: 2px; color: #%06x;\">"
@@ -1821,7 +1827,7 @@
 				commstream = NULL;
 			}
 			else {
-				fetch_comments(comments, t->format);
+				fetch_comments(comments, (CamelStream *)t->format);
 			}
 			camel_stream_printf (fstream, "</div>");
 		}	
@@ -2772,7 +2778,7 @@
 	rfmsg->body = (gchar *)(msg->response_body->data);
 	rfmsg->length = msg->response_body->length; 
 #endif
-	xmlNode *app;
+	xmlChar *app;
 	xmlNode *doc = (xmlNode *)parse_html_sux (rfmsg->body, rfmsg->length);
 	while (doc) {
 		doc = html_find(doc, "link");
@@ -4064,9 +4070,9 @@
 
 static void
 #if LIBSOUP_VERSION < 2003000
-finish_create_image (SoupMessage *msg, CamelStream *user_data)
+finish_create_image (SoupMessage *msg, gchar *user_data)
 #else
-finish_create_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
+finish_create_image (SoupSession *soup_sess, SoupMessage *msg, gchar *user_data)
 #endif
 {
 	g_print("finish_image(): status:%d, user_data;%s\n", msg->status_code);