evolution-rss r280 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri May 30 17:19:03 2008
New Revision: 280
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=280&view=rev

Log:
Fri 30 May 2008 12:43:24 PM EEST <lucilanga gnome org>

* make Cancel All button work (fix #535689)
* fix for bug #535670

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/org-gnome-evolution-rss.eplug.xml
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri May 30 17:19:03 2008
@@ -27,8 +27,8 @@
 	* check loading of images in certain feeds
 	* search in the content of page for feed
 	* obey ttl entity
-	* make feed message forwardable/replayable
 	* check rename feed when evo 2.24 x86_64 
+	* make feed message forwardable/replayable
 	* add debug points for showing steps of current operation (group operations)
 	* when adding a feed as opml file offer to import (file detection)
 	* possibly make network timeout customizable

Modified: trunk/src/org-gnome-evolution-rss.eplug.xml
==============================================================================
--- trunk/src/org-gnome-evolution-rss.eplug.xml	(original)
+++ trunk/src/org-gnome-evolution-rss.eplug.xml	Fri May 30 17:19:03 2008
@@ -38,6 +38,14 @@
 
 	<hook class="org.gnome.evolution.mail.format:1.0">
       <group id="EMFormatHTMLDisplay">
+        <item flags="inline_disposition" mime_type="x-evolution/evolution-rss-feed"
+          format="org_gnome_cooly_format_rss"/>
+      </group>
+      <group id="EMFormat">
+        <item flags="inline_disposition" mime_type="x-evolution/evolution-rss-feed"
+          format="org_gnome_cooly_format_rss"/>
+      </group>
+      <group id="EMFormatHTMLDisplay">
         <item flags="inline_disposition" mime_type="text/evolution-rss-feed"
           format="org_gnome_cooly_format_rss"/>
       </group>

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri May 30 17:19:03 2008
@@ -1562,7 +1562,6 @@
        	g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
 	g_unsetenv("MOZILLA_FIVE_HOME");
 
-	gecko_init();
 
 	gchar *profile_dir = g_build_filename (g_get_home_dir (),
                                               ".evolution",
@@ -1571,6 +1570,7 @@
 
         gtk_moz_embed_set_profile_path (profile_dir, "mozembed-rss");
         g_free (profile_dir);
+	gecko_init();
 }
 #endif
 
@@ -2899,7 +2899,7 @@
 
 /* for camel operation status */
 static void
-op_status(CamelOperation *op, const char *what, int pc, void *data)
+my_op_status(CamelOperation *op, const char *what, int pc, void *data)
 {
 	g_print("OP STATUS\n");
 	g_print("CANCEL!!!!\n");
@@ -2969,7 +2969,7 @@
                         
         info->uri = g_strdup("feed"); //g_stddup
 
-        info->cancel = camel_operation_new (op_status, info);
+        info->cancel = camel_operation_new (my_op_status, info);
         info->state = SEND_ACTIVE;
 //        info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
                         
@@ -3091,9 +3091,9 @@
 void
 rss_finalize(void)
 {
-	d(g_print("RSS: cleaning all remaining sessions .."));
+	g_print("RSS: cleaning all remaining sessions ..");
 	abort_all_soup();
-	d(g_print(".done\n"));
+	g_print(".done\n");
 	if (rf->mozembed)
 		gtk_widget_destroy(rf->mozembed);
 	gecko_shutdown();