evolution-rss r320 - trunk/src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Jul  1 09:09:15 2008
New Revision: 320
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=320&view=rev

Log:
2008-07-01  Lucian Langa  <lucilanga gnome org>

* fix building with firefox-devel

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

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	Tue Jul  1 09:09:15 2008
@@ -32,13 +32,13 @@
 	<hook class="org.gnome.evolution.mail.events:1.0">
         	<event type="pass" target="message" id="message.reading" handle="org_gnome_cooly_article_show"/>
 	</hook>
-	<hook class="org.gnome.evolution.mail.events:1.0">
+<!--	<hook class="org.gnome.evolution.mail.events:1.0">
         	<event type="pass" target="folder" id="folder.custom_icon" handle="org_gnome_cooly_folder_icon"/>
 	</hook>
 
 	<hook class="org.gnome.evolution.mail.events:1.0">
         	<event type="pass" target="folder" id="folder.refresh" handle="org_gnome_cooly_folder_refresh"/>
-	</hook>
+	</hook>-->
 
 	<hook class="org.gnome.evolution.mail.format:1.0">
       <group id="EMFormatHTMLDisplay">
@@ -58,7 +58,7 @@
           format="org_gnome_cooly_format_rss"/>
       </group>
     </hook>
-	<hook class="org.gnome.evolution.mail.config:1.0">
+<!--	<hook class="org.gnome.evolution.mail.config:1.0">
                 <group id="org.gnome.evolution.mail.folderConfig" 
                         target="folder"
                         check= "rss_folder">
@@ -68,7 +68,7 @@
                         _label="Size" 
                         factory="folder_factory"/>
                 </group>
-        </hook>
+        </hook>-->
 
 <hook class="org.gnome.evolution.mail.events:1.0">
     <event id="mail.sendreceive" 

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Jul  1 09:09:15 2008
@@ -2850,7 +2850,7 @@
 	if (GPOINTER_TO_INT(g_hash_table_lookup(rf->hrupdate, lookup_key(key))) == 2
 	 && g_hash_table_lookup(rf->hre, lookup_key(key)))
 	{
-	g_print("key:%s\n", key);
+		d(g_print("custom key:%s\n", key));
 		guint ttl = GPOINTER_TO_INT(g_hash_table_lookup(rf->hrttl, lookup_key(key)));
 		CDATA *cdata = g_new0(CDATA, 1);
 		cdata->key = key;
@@ -2874,7 +2874,6 @@
 custom_feed_timeout(void)
 {
 	g_hash_table_foreach(rf->hrname, custom_fetch_feed, statuscb);
-	g_hash_table_foreach(custom_timeout, print_hash, NULL);
 }
 
 static void
@@ -3266,7 +3265,6 @@
 		bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 		rss_gconf = gconf_client_get_default();
 		upgrade = 1;
-		printf("RSS Plugin enabled (evolution-rss %s)\n", VERSION);
 		char *d;
         	d = getenv("RSS_VERBOSE_DEBUG");
         	if (d)
@@ -3275,6 +3273,9 @@
 		//initiate main rss structure
 		if (!rf)
 		{
+			printf("RSS Plugin enabled (evolution %s, evolution-rss %s)\n",
+				EVOLUTION_VERSION_STRING,
+				VERSION);
 			rf = malloc(sizeof(rssfeed));
 			memset(rf, 0, sizeof(rssfeed));
 			rf->setup = read_feeds(rf);
@@ -4611,7 +4612,7 @@
 	}
 	total = camel_folder_get_message_count (folder);
 	camel_object_unref (folder);
-	g_print("=> total:%d\n", total);
+	d(g_print("delete => remaining total:%d\n", total));
 fail:	g_free(real_name);
 	inhibit_read = 0;
 }