GNOME.org
 

[evolution-rss] add missing headers; remove obsolete code

commit f57aea00d2b8c1509125cf59e18efc6bb31ea3dc
Author: Lucian Langa <lucilanga gnome org>
Date:   Fri May 15 17:51:05 2009 +0300

    add missing headers; remove obsolete code
---
 src/evolution-import-rss.c |   15 +++++-----
 src/misc.c                 |    1 +
 src/network-soup.c         |   64 +++++++++++---------------------------------
 src/parser.h               |    1 +
 src/rss.c                  |    1 -
 src/rss.h                  |   15 +++++-----
 6 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/src/evolution-import-rss.c b/src/evolution-import-rss.c
index c7d4b5b..a3d32ab 100644
--- a/src/evolution-import-rss.c
+++ b/src/evolution-import-rss.c
@@ -22,7 +22,9 @@
 #include <config.h>
 #endif
 
+#include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <glib.h>
@@ -148,13 +150,15 @@ no_evo_cb (gpointer user_data)
 	g_print("no evolution running!\n");
 	g_print("trying to start...\n");
 	g_main_loop_quit(loop);
+	return TRUE;
 }
 
 static gboolean
 err_evo_cb (gpointer user_data)
 {
-	g_print("cannot start evolution...retry %d\n", user_data);
+	g_print("cannot start evolution...retry %d\n", GPOINTER_TO_INT(user_data));
 	g_main_loop_quit(loop);
+	return TRUE;
 }
 
 int
@@ -178,20 +182,17 @@ main (int argc, char *argv[])
 		g_print("fireing evolution...\n");
 		sleep(30);
         	send_dbus_ping ();
-		g_timeout_add (EVOLUTION_PING_TIMEOUT, err_evo_cb, (gpointer)i++);
+		g_timeout_add (EVOLUTION_PING_TIMEOUT, err_evo_cb, GINT_TO_POINTER(i++));
 		g_main_loop_run(loop);
 	}
 	
 
-	if (evo_running)
-	{
+	if (evo_running) {
 		if (s)
         		send_dbus_message ("evolution_rss_feed", s);
 		else
 			g_print("Syntax: evolution-import-rss URL\n");
-	}
-	else
-	{
+	} else {
 		g_print("evolution repetably failed to start!\n");
 		g_print("Cannot add feed!");
 	}
diff --git a/src/misc.c b/src/misc.c
index 08f0679..a7e7c5e 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -29,6 +29,7 @@
 #include <camel/camel-mime-utils.h>
 
 #include "rss.h"
+#include "parser.h"
 #include "misc.h"
 
 int
diff --git a/src/network-soup.c b/src/network-soup.c
index 182f650..81c142e 100644
--- a/src/network-soup.c
+++ b/src/network-soup.c
@@ -179,6 +179,10 @@ unblock_free (gpointer user_data, GObject *ex_msg)
 	g_hash_table_find(rf->key_session,
 		remove_if_match,
 		user_data);
+	//this has been moved to soup-internal
+	/*gboolean prune = soup_session_try_prune_connection (user_data);
+	if (prune)
+		g_object_unref(user_data);*/
 	soup_session_abort (user_data);
 }
 
@@ -286,8 +290,7 @@ save_up(gpointer data)
 	g_free(feed_dir);
 
 	FILE *fr = fopen(feed_name, "w+");
-	if (fr)
-	{
+	if (fr) {
         	gchar *user = g_hash_table_lookup(rf->hruser, data);
 			fputs(user, fr);
 	        fputs("\n", fr);
@@ -395,17 +398,13 @@ reauthenticate (SoupSession *session,
         gpointer data)
 {
 	gchar *user, *pass;
-	if (rf->soup_auth_retry)
-	{
+	if (rf->soup_auth_retry) {
 		//means we're already tested once and probably
 		//won't try again
 		rf->soup_auth_retry = FALSE;
-		if (create_user_pass_dialog(data))
-		{
+		if (create_user_pass_dialog(data)) {
 			rf->soup_auth_retry = FALSE;
-		}
-		else
-		{
+		} else {
 			rf->soup_auth_retry = TRUE;
 		}
         	*username = g_strdup(g_hash_table_lookup(rf->hruser, data));
@@ -417,7 +416,7 @@ static int
 conn_mainloop_quit (void *data)
 {
 	g_print("loop quit");
-  g_main_loop_quit (data);
+	g_main_loop_quit (data);
 	return TRUE;
 }
 
@@ -432,7 +431,7 @@ net_get_status(const char *url, GError **err)
 	SoupMessage *req = NULL;
 	guint response = 0;
 	SoupSession *soup_sess = NULL;
-	GSList *headers;
+	GSList *headers = NULL;
 
 	if (!rf->b_session)
 		rf->b_session = soup_sess = 
@@ -441,8 +440,7 @@ net_get_status(const char *url, GError **err)
 		soup_sess = rf->b_session;
 
 	req = soup_message_new(SOUP_METHOD_GET, url);
-	if (!req)
-	{
+	if (!req) {
 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
 				soup_status_get_phrase(2));			//invalid url
 		goto out;
@@ -604,8 +602,7 @@ net_post_blocking(gchar *url, GSList *headers, GString *post,
 #endif
 
 	req = soup_message_new(SOUP_METHOD_GET, url);
-	if (!req)
-	{
+	if (!req) {
 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
 				soup_status_get_phrase(2));			//invalid url
 		goto out;
@@ -668,24 +665,7 @@ out:
 gboolean
 cancel_soup_sess(gpointer key, gpointer value, gpointer user_data)
 {
-#if LIBSOUP_VERSION < 2003000
-        SoupUri *uri =  soup_message_get_uri((SoupMessage *)value);
-#else
-        SoupURI *uri =  soup_message_get_uri((SoupMessage *)value);
-#endif
-        d(g_print("cancel url:%s%s?%s\n", uri->host, uri->path, uri->query?uri->query:""));
-
-        if (SOUP_IS_SESSION(key))
-        {
-/*              if (SOUP_IS_MESSAGE(value))
-                {
-#if LIBSOUP_VERSION < 2003000
-                        soup_message_set_status(value,  SOUP_STATUS_CANCELLED);
-                        soup_session_cancel_message(key, value);
-#else
-                        soup_session_cancel_message(key, value, SOUP_STATUS_CANCELLED);
-#endif
-                }*/
+        if (SOUP_IS_SESSION(key)) {
                 soup_session_abort(key);
                 g_hash_table_find(rf->key_session,
                         remove_if_match,
@@ -706,30 +686,18 @@ abort_all_soup(void)
         //abort all session
         rf->cancel = 1;
         rf->cancel_all = 1;
-        if (rf->abort_session)
-        {
+        if (rf->abort_session) {
                 g_hash_table_foreach(rf->abort_session, remove_weak, NULL);
                 g_hash_table_foreach_remove(rf->abort_session, cancel_soup_sess, NULL);
 //              g_hash_table_foreach(rf->abort_session, cancel_soup_sess, NULL);
                 g_hash_table_destroy(rf->session);
                 rf->session = g_hash_table_new(g_direct_hash, g_direct_equal);
         }
-        if (rf->progress_bar)
-        {
+        if (rf->progress_bar) {
                 gtk_progress_bar_set_fraction((GtkProgressBar *)rf->progress_bar, 1);
                 rf->progress_bar = NULL;        //there's no need to update bar once we canceled feeds
         }
-        if (rf->b_session)
-        {
-/*              if (SOUP_IS_MESSAGE(rf->b_msg_session))
-                {
-#if LIBSOUP_VERSION < 2003000
-                        soup_message_set_status(rf->b_msg_session, SOUP_STATUS_CANCELLED);
-                        soup_session_cancel_message(rf->b_session, rf->b_msg_session);
-#else
-                        soup_session_cancel_message(rf->b_session, rf->b_msg_session, SOUP_STATUS_CANCELLED);
-#endif
-                }*/
+        if (rf->b_session) {
                 soup_session_abort(rf->b_session);
                 rf->b_session = NULL;
                 rf->b_msg_session = NULL;
diff --git a/src/parser.h b/src/parser.h
index 39d6663..2aeb59a 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -26,6 +26,7 @@ char *layer_find_innerelement (xmlNodePtr node, char *match, char *el, char *fai
 gchar *layer_find_innerhtml (xmlNodePtr node, char *match, char *submatch, char *fail);
 xmlNodePtr layer_find_pos (xmlNodePtr node, char *match, char *submatch);
 char *layer_find_tag (xmlNodePtr node, char *match, char *fail);
+gchar *decode_entities(gchar *source);
 
 #endif /*__RSS_H__*/
 
diff --git a/src/rss.c b/src/rss.c
index 344c9c3..48c7ccd 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -229,7 +229,6 @@ static void
 dialog_key_destroy (GtkWidget *widget, gpointer data);
 guint fallback_engine(void);
 
-void generic_finish_feed(rfMessage *msg, gpointer user_data);
 gchar *print_comments(gchar *url, gchar *stream);
 static void refresh_cb (GtkWidget *button, EMFormatHTMLPObject *pobject);
 
diff --git a/src/rss.h b/src/rss.h
index 64827a9..8d077c9 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -296,6 +296,13 @@ typedef struct rss_auth {
 	GtkWidget *rememberpass;
 } RSS_AUTH;
 
+struct _rfMessage {
+        guint    status_code;
+        gchar   *body;
+        goffset  length;
+};
+
+typedef struct _rfMessage rfMessage;
 guint ftotal;
 guint farticle;
 
@@ -334,6 +341,7 @@ finish_enclosure (SoupMessage *msg, create_feed *user_data);
 #else
 finish_enclosure (SoupSession *soup_sess, SoupMessage *msg, create_feed *user_data);
 #endif
+void generic_finish_feed(rfMessage *msg, gpointer user_data);
 void textcb(NetStatusType status, gpointer statusdata, gpointer data);
 #ifdef HAVE_GECKO
 void rss_mozilla_init(void);
@@ -372,12 +380,5 @@ typedef struct FEED_FOLDERS {
 	gchar *rname;		// renamed folder name
 } feed_folders;
 
-struct _rfMessage {
-        guint    status_code;
-        gchar   *body;
-        goffset  length;
-};
-
-typedef struct _rfMessage rfMessage;
 
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]