[evolution-rss] remove SoupSession fetch_unblocking

[Lucian Langa <lucilanga src gnome org>]

commit abc34457290688ea6768bae63b23996a3d39e9f1
Author: Lucian Langa <lucilanga gnome org>
Date:   Mon Aug 17 17:27:39 2009 +0300

    remove SoupSession fetch_unblocking

 src/fetch.c        |    5 ++---
 src/fetch.h        |    2 +-
 src/network-soup.c |    6 +++---
 src/network-soup.h |    2 +-
 src/rss.c          |   10 +++++-----
 5 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/src/fetch.c b/src/fetch.c
index 8c3debe..6d2bd5f 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -66,7 +66,7 @@ error:
 //fetch feed
 //FIXME gio callback hardcoded 
 
-SoupSession*
+gboolean
 fetch_unblocking(gchar *url, NetStatusCallback cb, gpointer data, 
 				gpointer cb2, gpointer cbdata2,
 				guint track,
@@ -81,14 +81,13 @@ fetch_unblocking(gchar *url, NetStatusCallback cb, gpointer data,
 
 	if (!g_ascii_strcasecmp(scheme, "file")) {
 		g_free(scheme);
-		file_get_unblocking(url,
+		return file_get_unblocking(url,
 				NULL, // add status here //
 				NULL,
 				gio_finish_feed,
 				cbdata2,
 				0,
 				err);	
-		return NULL;
 	} else {
 		g_free(scheme);
 		return net_get_unblocking(url,
diff --git a/src/fetch.h b/src/fetch.h
index 8bc41f8..a040c5f 100644
--- a/src/fetch.h
+++ b/src/fetch.h
@@ -28,7 +28,7 @@ GString *fetch_blocking(gchar *url, GSList *headers, GString *post,
                   NetStatusCallback cb, gpointer data,
                   GError **err);
 
-SoupSession *fetch_unblocking(gchar *url, NetStatusCallback cb, gpointer data,
+gboolean fetch_unblocking(gchar *url, NetStatusCallback cb, gpointer data,
                                 gpointer cb2, gpointer cbdata2,
                                 guint track,
                                 GError **err);
diff --git a/src/network-soup.c b/src/network-soup.c
index 6cd964f..d7a4934 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -497,7 +497,7 @@ out:
 	return response;
 }
 
-SoupSession*
+gboolean
 net_get_unblocking(gchar *url, 
 				NetStatusCallback cb, gpointer data, 
 				gpointer cb2, gpointer cbdata2,
@@ -544,7 +544,7 @@ net_get_unblocking(gchar *url,
 	if (!msg) {
 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
 				soup_status_get_phrase(2));			//invalid url
-		return (SoupSession *)-1;
+		return FALSE;
 	}
 
 	if (track) {
@@ -579,7 +579,7 @@ net_get_unblocking(gchar *url,
 //	g_object_weak_ref (G_OBJECT(soup_sess), unblock_free, soup_sess);
 //	GMainLoop *mainloop = g_main_loop_new (g_main_context_default (), FALSE);
   //	g_timeout_add (10 * 1000, &conn_mainloop_quit, mainloop);
-	return soup_sess;
+	return TRUE;
 }
 
 GString*
diff --git a/src/network-soup.h b/src/network-soup.h
index 2e4ec0c..9cc3dfb 100644
--- a/src/network-soup.h
+++ b/src/network-soup.h
@@ -23,7 +23,7 @@
 
 void abort_all_soup(void);
 gboolean cancel_soup_sess(gpointer key, gpointer value, gpointer user_data);
-SoupSession *net_get_unblocking(gchar *url,
+gboolean net_get_unblocking(gchar *url,
                                 NetStatusCallback cb, gpointer data,
                                 gpointer cb2, gpointer cbdata2,
                                 guint track,
diff --git a/src/rss.c b/src/rss.c
index 79cb515..549be9b 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -3043,7 +3043,6 @@ finish_comments (SoupMessage *msg, EMFormatHTML *user_data)
 finish_comments (SoupSession *soup_sess, SoupMessage *msg, EMFormatHTML *user_data)
 #endif
 {
-	g_print("...fetch coments end.\n");
 	guint reload=0;
 
 	comments_session = g_slist_remove(comments_session, soup_sess);
@@ -3107,17 +3106,18 @@ fetch_comments(gchar *url, EMFormatHTML *stream)
 {
 	GError *err = NULL;
 	SoupSession *comm_sess = NULL;
-	g_print("\nFetching comments from: %s\n", url);
+	d(g_print("\nFetching comments from: %s\n", url));
+	gchar *uniqcomm = g_strdup_printf("COMMENT-%s", url);
 	
-	comm_sess = fetch_unblocking(
+	fetch_unblocking(
 			url,
 			NULL,
-			NULL,
+			uniqcomm,
 			(gpointer)finish_comments,
 			stream,	// we need to dupe key here
 			1,
 			&err);
-
+	comm_sess = g_hash_table_lookup(rf->key_session, uniqcomm);
 	comments_session = g_slist_append(comments_session, comm_sess);
 	
 	if (err) {