[evolution-rss] fix deleting folder contents

[Lucian Langa <lucilanga src gnome org>]

commit edad4c7d96f72410041f75297c9dbd2fb4e454f9
Author: Lucian Langa <lucilanga gnome org>
Date:   Fri Apr 8 13:39:16 2011 +0300

    fix deleting folder contents

 src/rss-config-factory.c |    8 +++-----
 src/rss.c                |   25 ++++++++++++-------------
 2 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 1ce8917..a49fa2f 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -1125,7 +1125,7 @@ rss_delete_folders (CamelStore *store,
 		full_name,
 		flags, error);
 #endif
-	if (!fi || error != NULL)
+	if (!fi || *error != NULL)
 		return;
 
 	d("call rss_delete_rec()\n");
@@ -1342,10 +1342,8 @@ delete_response(GtkWidget *selector, guint response, gpointer user_data)
 				GTK_TREE_VIEW(user_data));
 		if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
 			gtk_tree_model_get (
-				model,
-				&iter,
-				4,
-				&name,
+				model, &iter,
+				4, &name,
 				-1);
 			rss_delete_feed(name,
 				gconf_client_get_bool(
diff --git a/src/rss.c b/src/rss.c
index b6a1027..799d029 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -4243,15 +4243,17 @@ rss_delete_feed(gchar *full_path, gboolean folder)
 	real_name = g_hash_table_lookup(rf->feed_folders, name);
 	if (!real_name)
 		real_name = name;
-	rss_delete_folders (store, full_path, &error);
-	if (error != NULL) {
-		e_alert_run_dialog_for_args(
-			e_shell_get_active_window (NULL),
-			"mail:no-delete-folder",
-			full_path,
-			error->message,
-			NULL);
-		g_clear_error(&error);
+	if (folder) {
+		rss_delete_folders (store, full_path, &error);
+		if (error != NULL) {
+			e_alert_run_dialog_for_args(
+				e_shell_get_active_window (NULL),
+				"mail:no-delete-folder",
+				full_path,
+				error->message,
+				NULL);
+			g_clear_error(&error);
+		}
 	}
 	//also remove status file
 	tkey = g_hash_table_lookup(rf->hrname,
@@ -4273,10 +4275,7 @@ rss_delete_feed(gchar *full_path, gboolean folder)
 	tmp = g_strdup_printf("%s.fav", feed_name);
 	unlink(tmp);
 	g_free(tmp);
-out:	if (folder) {
-		d("print folder:%s\n", real_name);
-		remove_feed_hash(real_name);
-	}
+out:	remove_feed_hash(real_name);
 	delete_feed_folder_alloc(name);
 	g_free(name);
 	g_idle_add((GSourceFunc)store_redraw,