evolution-rss r304 - trunk/src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Jun 24 05:31:23 2008
New Revision: 304
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=304&view=rev

Log:
2008-06-22  Lucian Langa  <lucilanga gnome org>

* misc cleanups
* configure.ac: bump version to 0.1.0
* custom feeds update

Modified:
   trunk/src/rss-config-factory.c
   trunk/src/rss.c

Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c	(original)
+++ trunk/src/rss-config-factory.c	Tue Jun 24 05:31:23 2008
@@ -1855,7 +1855,8 @@
 	gtk_box_pack_start(GTK_BOX(sf->combo_hbox), combo, FALSE, FALSE, 0);
 #endif
 
-#if (EVOLUTION_VERSION < 22300)		// include devel too
+g_print("EVO VER:%d\n", EVOLUTION_VERSION);
+#if (EVOLUTION_VERSION < 22200)		// include devel too
 	/*first make the tab visible */
 	g_object_set(glade_xml_get_widget(sf->gui, "label_HTML"),
 					"visible", TRUE, 

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Jun 24 05:31:23 2008
@@ -136,6 +136,7 @@
 GtkWidget *flabel;
 //#define RSS_DEBUG 1
 guint nettime_id = 0;
+guint force_update = 0;
 
 #define DEFAULT_FEEDS_FOLDER "News&Blogs"
 #define DEFAULT_NO_CHANNEL "Untitled channel"
@@ -2525,15 +2526,16 @@
 
 	//exclude feeds that have special update interval or 
 	//no update at all
-	if (GPOINTER_TO_INT(g_hash_table_lookup(rf->hrupdate, lookup_key(key))) >= 2)
+	if (GPOINTER_TO_INT(g_hash_table_lookup(rf->hrupdate, lookup_key(key))) >= 2
+	&& !force_update)
 		return;
 
 	// check if we're enabled and no cancelation signal pending
 	// and no imports pending
 	if (g_hash_table_lookup(rf->hre, lookup_key(key)) && !rf->cancel && !rf->import)
 	{
-		d(g_print("\nFetching: %s..%s\n", 
-			g_hash_table_lookup(rf->hr, lookup_key(key)), key));
+		g_print("\nFetching: %s..%s\n", 
+			g_hash_table_lookup(rf->hr, lookup_key(key)), key);
 		rf->feed_queue++;
 
 		net_get_unblocking(
@@ -2827,7 +2829,6 @@
 	if (rf->online)
 	{
 		g_print("Fetch (custom) RSS articles...\n");
-		rf->pending = TRUE;
 		check_folders();
 		rf->err = NULL;
 		//taskbar_op_message();
@@ -2861,7 +2862,6 @@
  		else if (rf->cancel && !rf->feed_queue)
                 	rf->cancel = 0;         //all feeds where either procesed or skipped
 	}
-	rf->pending = FALSE;
 	return TRUE;
 }
 
@@ -3020,12 +3020,14 @@
                 check_folders();
 
                 rf->err = NULL;
+		force_update = 1;
 		taskbar_op_message();
 		network_timeout();
                 g_hash_table_foreach(rf->hrname, fetch_feed, statuscb);
                 // reset cancelation signal
                 if (rf->cancel)
                         rf->cancel = 0;
+		force_update = 0;
                 rf->pending = FALSE;
         }
 #endif
@@ -3217,12 +3219,14 @@
 		check_folders();
 	
 		rf->err = NULL;
+		force_update = 1;
 		taskbar_op_message();
 		network_timeout();
 		g_hash_table_foreach(rf->hrname, fetch_feed, statuscb);	
 		// reset cancelation signal
 		if (rf->cancel)
 			rf->cancel = 0;
+		force_update = 0;
 		rf->pending = FALSE;
 	}