[evolution-rss] various cleanups

[Lucian Langa <lucilanga src gnome org>]

commit 11d0f87b75aadb5cfb37547a28fcbdf27e20de54
Author: Lucian Langa <lucilanga gnome org>
Date:   Wed Nov 4 22:10:58 2009 +0200

    various cleanups

 src/network-soup.c                    |   18 +++++++-----------
 src/org-gnome-evolution-rss.eplug.xml |    2 +-
 src/rss.c                             |   11 +++++------
 3 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/src/network-soup.c b/src/network-soup.c
index 5dd5e7e..9e6695b 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -399,7 +399,7 @@ authenticate (SoupSession *session,
 
 	user = g_hash_table_lookup(rf->hruser, data);
 	pass = g_hash_table_lookup(rf->hrpass, data);
-	
+
 	if (user && pass) {
 #if LIBSOUP_VERSION < 2003000
 		*username = g_strdup(user);
@@ -417,7 +417,7 @@ authenticate (SoupSession *session,
 		//preety annoying to pop the authentication popup in front
 		//of the user every time feeds are automatically fetched
 		if (!read_up(data) && !rf->autoupdate) {
-			//we will continue after user has made a decision on 
+			//we will continue after user has made a decision on
 			//web auth dialog
 			//Bug 522147 â?? need to be able to pause synchronous I/O
 authpop:		if (G_OBJECT_TYPE(session) == SOUP_TYPE_SESSION_ASYNC) {
@@ -452,8 +452,8 @@ reauthenticate (SoupSession *session,
 		} else {
 			rf->soup_auth_retry = TRUE;
 		}
-        	*username = g_strdup(g_hash_table_lookup(rf->hruser, data));
-        	*password = g_strdup(g_hash_table_lookup(rf->hrpass, data));
+		*username = g_strdup(g_hash_table_lookup(rf->hruser, data));
+		*password = g_strdup(g_hash_table_lookup(rf->hrpass, data));
 	}
 }
 #endif
@@ -544,10 +544,7 @@ net_get_unblocking(gchar *url,
 	SoupSession *soup_sess;
 	gchar *agstr;
 
-	soup_sess =
-		soup_session_async_new_with_options(SOUP_SESSION_TIMEOUT, SS_TIMEOUT,
-						SOUP_SESSION_IDLE_TIMEOUT, SS_TIMEOUT, NULL);
-//		soup_session_async_new();
+	soup_sess = soup_session_async_new();
 
 
 #if LIBSOUP_VERSION > 2024000
@@ -574,7 +571,6 @@ net_get_unblocking(gchar *url,
 	if (!rf->key_session)
 		rf->key_session = g_hash_table_new(g_direct_hash, g_direct_equal);
 
-
 	g_signal_connect (soup_sess, "authenticate",
             G_CALLBACK (authenticate), (gpointer)url);
 #if LIBSOUP_VERSION < 2003000
@@ -788,14 +784,14 @@ sync_gecko_cookies(void)
 void
 rss_soup_init(void)
 {
-#if LIBSOUP_VERSION > 2026002 && defined(HAVE_LIBSOUP_GNOME) 
+#if LIBSOUP_VERSION > 2026002 && defined(HAVE_LIBSOUP_GNOME)
 	if (gconf_client_get_bool (rss_gconf, GCONF_KEY_ACCEPT_COOKIES, NULL)) {
 		gchar *feed_dir = rss_component_peek_base_directory();
 		gchar *cookie_path = g_build_path("/", feed_dir, "rss-cookies.sqlite", NULL);
 		gchar *moz_cookie_path = g_build_path("/", feed_dir, "mozembed-rss", "cookies.sqlite", NULL);
 		g_free(feed_dir);
 
-		rss_soup_jar = 
+		rss_soup_jar =
 			soup_cookie_jar_sqlite_new (cookie_path, FALSE);
 
 		if (!g_file_test(moz_cookie_path, G_FILE_TEST_EXISTS|G_FILE_TEST_IS_SYMLINK)) {
diff --git a/src/org-gnome-evolution-rss.eplug.xml b/src/org-gnome-evolution-rss.eplug.xml
index 8d62984..1649dad 100644
--- a/src/org-gnome-evolution-rss.eplug.xml
+++ b/src/org-gnome-evolution-rss.eplug.xml
@@ -94,7 +94,7 @@ HTML can be displayed using the following engines: gtkHTML, Apple's Webkit or Fi
 <hook class="org.gnome.evolution.mail.events:1.0">
     <event id="mail.sendreceive"
 	enable="sendreceive"
-	handle="org_gnome_cooly_rss"
+	handle="org_gnome_evolution_rss"
 	target="sendreceive"/>
 </hook>
 
diff --git a/src/rss.c b/src/rss.c
index 02f82d9..9827ee8 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -2770,7 +2770,6 @@ void org_gnome_evolution_rss_article_show(void *ep, void *t);
 #ifdef EVOLUTION_2_12
 void org_gnome_evolution_rss_article_show(void *ep, EMEventTargetMessage *t)
 {
-g_print("show\n");
 	if (rf && (!inhibit_read || !delete_op))
 		rf->current_uid = g_strdup(t->uid);
 }
@@ -4279,7 +4278,7 @@ custom_update_articles(CDATA *cdata)
 
 gboolean
 custom_fetch_feed(gpointer key, gpointer value, gpointer user_data)
-{ 
+{
 	guint time_id = 0;
 	guint ttl, ttl_multiply;
 	if (!custom_timeout)
@@ -4666,16 +4665,16 @@ dialog_response(GtkDialog *gd, int button, struct _send_data *data)
 
 void
 #ifdef EVOLUTION_2_12
-org_gnome_cooly_rss(void *ep, EMEventTargetSendReceive *t);
+org_gnome_evolution_rss(void *ep, EMEventTargetSendReceive *t);
 #else
-org_gnome_cooly_rss(void *ep, EMPopupTargetSelect *t);
+org_gnome_evolution_rss(void *ep, EMPopupTargetSelect *t);
 #endif
 
 void
 #ifdef EVOLUTION_2_12
-org_gnome_cooly_rss(void *ep, EMEventTargetSendReceive *t)
+org_gnome_evolution_rss(void *ep, EMEventTargetSendReceive *t)
 #else
-org_gnome_cooly_rss(void *ep, EMPopupTargetSelect *t)
+org_gnome_evolution_rss(void *ep, EMPopupTargetSelect *t)
 #endif
 {
 #ifdef EVOLUTION_2_12