From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 15 Mar 2004 07:43:31 +0000 (+0000)
Subject: fix bug where unsubscribing a newsgroup would destroy (most of the) filtering rules
X-Git-Tag: rel_0_9_11~75
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b7673eb2d9cc86757ce1166461f12b4cbad2b493;ds=sidebyside

fix bug where unsubscribing a newsgroup would destroy (most of the) filtering rules
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 774b59657..00f3941cb 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-02-15 [paul]	0.9.10claws15
+
+	* src/folderview.c
+		fix bug where unsubscribing a newsgroup would destroy
+		(most of the) filtering rules
+
 2004-02-15 [paul]	0.9.10claws14
 
 	* src/folderview.c
diff --git a/configure.ac b/configure.ac
index b107e8ed6..5b3fed154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/folderview.c b/src/folderview.c
index b2b676f7f..ccf4337e3 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2373,6 +2373,7 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
 	FolderItem *item;
 	gchar *name;
 	gchar *message;
+	gchar *old_id;
 	AlertValue avalue;
 
 	if (!folderview->selected) return;
@@ -2383,6 +2384,8 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
 	g_return_if_fail(FOLDER_TYPE(item->folder) == F_NEWS);
 	g_return_if_fail(item->folder->account != NULL);
 
+	old_id = folder_item_get_identifier(item);
+
 	name = trim_string(item->path, 32);
 	message = g_strdup_printf(_("Really delete newsgroup `%s'?"), name);
 	avalue = alertpanel(_("Delete newsgroup"), message,
@@ -2399,7 +2402,8 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
 	folder_item_remove(item);
 	folder_write_list();
 	
-	prefs_filtering_delete_path(name);
+	prefs_filtering_delete_path(old_id);
+	g_free(old_id);
 }
 
 static void folderview_rm_news_server_cb(FolderView *folderview, guint action,