evolution-rss r252 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Wed Apr 30 20:19:05 2008
New Revision: 252
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=252&view=rev

Log:
fix debug messages; taskbar op

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

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Wed Apr 30 20:19:05 2008
@@ -40,3 +40,4 @@
 	* check rename feed when evo 2.24 x86_64 
 	* disable browser alerts messages
 	* make cancel all button work
+	* add debug points for showing steps of current operation

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Wed Apr 30 20:19:05 2008
@@ -2101,11 +2101,11 @@
 	if (!feed->validate)
 		goto add;
 		
-	g_print("feed->feed_url:%s\n", feed->feed_url);
+	d(g_print("feed->feed_url:%s\n", feed->feed_url));
         content = net_post_blocking(feed->feed_url, NULL, post, textcb, rf, &err);
         if (err)
 	{
-		g_print("err:%s\n", err->message);
+		d(g_print("setup_feed() -> err:%s\n", err->message));
 		rss_error(NULL, feed->feed_name ? feed->feed_name: "Unamed feed", _("Error while fetching feed."), err->message);
 		goto out;
         }
@@ -2113,7 +2113,7 @@
         xmlNodePtr root = NULL;
         xmlSubstituteEntitiesDefaultValue = 0;
         doc = xml_parse_sux (content->str, content->len);
-	d(g_print("content:%s\n", content->str));
+	d(g_print("content:\n%s\n", content->str));
 	root = xmlDocGetRootElement(doc);
 
 	if ((doc != NULL && root != NULL)
@@ -2217,6 +2217,8 @@
 	if (!key)
 		deleted = 1;
 
+	d(g_print("taskbar_op_finish() queue:%d\n", rf->feed_queue));
+
 	if (rf->feed_queue)
 	{
 		rf->feed_queue--;
@@ -2226,36 +2228,39 @@
 	}
 
 
-#ifndef EVOLUTION_2_12
-	if(rf->progress_dialog && rf->feed_queue == 0)
-        {
-             	gtk_widget_destroy(rf->progress_dialog);
-       		rf->progress_dialog = NULL;
-		rf->progress_bar = NULL;
+	if (rf->feed_queue == 0)
+	{
+		d(g_print("taskbar_op_finish()\n"));
 		taskbar_op_finish("main");
-        }
+#ifndef EVOLUTION_2_12
+		if(rf->progress_dialog)
+        	{
+        	     	gtk_widget_destroy(rf->progress_dialog);
+       			rf->progress_dialog = NULL;
+			rf->progress_bar = NULL;
+        	}
 #else
-	if(rf->label && rf->feed_queue == 0 && rf->info)
-	{
+		if(rf->label && rf->info)
+		{
                         gtk_label_set_markup (GTK_LABEL (rf->label), _("Canceled"));
-                if (rf->info->cancel_button)
-                        gtk_widget_set_sensitive(rf->info->cancel_button, FALSE);
+                	if (rf->info->cancel_button)
+                        	gtk_widget_set_sensitive(rf->info->cancel_button, FALSE);
 
-                g_hash_table_steal(rf->info->data->active, rf->info->uri);
-                rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
+                	g_hash_table_steal(rf->info->data->active, rf->info->uri);
+                	rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
 
-		if (g_hash_table_size(rf->info->data->active) == 0) {
-                        if (rf->info->data->gd)
-                                gtk_widget_destroy((GtkWidget *)rf->info->data->gd);
-                }
-                //clean data that might hang on rf struct
-                rf->sr_feed = NULL;
-                rf->label = NULL;
-                rf->progress_bar = NULL;
-                rf->info = NULL;
-		taskbar_op_finish("main");
-	}
+			if (g_hash_table_size(rf->info->data->active) == 0) {
+                        	if (rf->info->data->gd)
+                                	gtk_widget_destroy((GtkWidget *)rf->info->data->gd);
+                	}
+                	//clean data that might hang on rf struct
+                	rf->sr_feed = NULL;
+                	rf->label = NULL;
+                	rf->progress_bar = NULL;
+                	rf->info = NULL;
+		}
 #endif
+	}
 
 	if (rf->cancel_all)
 		goto out;
@@ -2285,8 +2290,8 @@
                 if (g_hash_table_size(rf->info->data->active) == 0) {
                         if (rf->info->data->gd)
                                 gtk_widget_destroy((GtkWidget *)rf->info->data->gd);
-			taskbar_op_finish("main");
                 }
+		taskbar_op_finish("main");
                 //clean data that might hang on rf struct
                 rf->sr_feed = NULL;
                 rf->label = NULL;
@@ -2385,8 +2390,8 @@
         	if (g_hash_table_size(rf->info->data->active) == 0) {
                 	if (rf->info->data->gd)
                         	gtk_widget_destroy((GtkWidget *)rf->info->data->gd);
-			taskbar_op_finish("main");
         	}
+		taskbar_op_finish("main");
 		//clean data that might hang on rf struct
 		rf->sr_feed = NULL;
 		rf->label = NULL;