[evolution-rss] fix compiler warnings

[Lucian Langa <lucilanga src gnome org>]

commit 146ec8fccbe560b5b0ccff6d5be48b63c6e87933
Author: Lucian Langa <lucilanga gnome org>
Date:   Fri Dec 4 19:43:03 2009 +0200

    fix compiler warnings

 src/rss-config-factory.c |    4 ++--
 src/rss.c                |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index f5c069d..3f00628 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -1071,7 +1071,7 @@ process_dialog_edit(add_feed *feed, gchar *url, gchar *feed_name)
 	gpointer md5;
 	CamelException ex;
 	CamelStore *store = rss_component_peek_local_store();
-	GtkWidget *msg_feeds;
+	GtkWidget *msg_feeds, *progress;
 
 #if EVOLUTION_VERSION < 22904
 	msg_feeds = e_error_new(
@@ -1082,7 +1082,7 @@ process_dialog_edit(add_feed *feed, gchar *url, gchar *feed_name)
 		"org-gnome-evolution-rss:rssmsg",
 		"",
 		NULL);
-	GtkWidget *progress = gtk_progress_bar_new();
+	progress = gtk_progress_bar_new();
 	gtk_box_pack_start(
 		GTK_BOX(((GtkDialog *)msg_feeds)->vbox),
 		progress,
diff --git a/src/rss.c b/src/rss.c
index 08df600..9749994 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -1083,7 +1083,7 @@ feed_to_xml(gchar *key)
 	ctmp = g_strdup_printf("%d", GPOINTER_TO_INT(g_hash_table_lookup(rf->hrdel_messages, lookup_key(key))));
         xmlSetProp (src, (xmlChar *)"messages", (xmlChar *)ctmp);
 	g_free(ctmp);
-        xmlSetProp (src, (xmlChar *)"unread", 
+        xmlSetProp (src, (xmlChar *)"unread",
 		(xmlChar *)(g_hash_table_lookup(rf->hrdel_unread, lookup_key(key)) ? "true" : "false"));
 
         src = xmlNewTextChild (root, NULL, (xmlChar *)"ttl", NULL);
@@ -1891,10 +1891,10 @@ gecko_click(GtkMozEmbed *mozembed, gpointer dom_event, gpointer user_data)
 	gint button;
 	GtkMenu *menu;
 	gchar *link = NULL;
-        GSList *menus = NULL;
-	gint i=0, menu_size;
 #if EVOLUTION_VERSION < 22900
         EMPopup *emp = NULL;
+        GSList *menus = NULL;
+	gint i=0, menu_size;
 #endif
 
 	if (-1 == (button = gecko_get_mouse_event_button (dom_event))) {
@@ -4178,7 +4178,7 @@ rss_delete_feed(gchar *full_path, gboolean folder)
 	rss_delete_folders (store, full_path, &ex);
 	if (camel_exception_is_set (&ex)) {
 #if EVOLUTION_VERSION < 22904
-		e_error_run(e_shell_get_active_window (NULL),
+		e_error_run(NULL,
 #else
 		e_alert_run_dialog_for_args(
 			e_shell_get_active_window (NULL),