talons

commit 9690829fbfd6c52b52e533116067316d978f2df4
parent d14322195e71f2355dc8cd5248e7e7a21dc7a7f2
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Wed, 18 Nov 2009 20:40:19 +0000

2009-11-18 [pawel]	3.7.3cvs16

	* src/news_gtk.c
		Fix Bug 2057 'Claws mail does not keep renamed names
		of nntp-subscribed groups'
		Check for already subscribed group using item->path for group
		comparision as folders item->path != item->name may be truth
		since we allowed renaming of newsgroups folders -> 3.5.0cvs11

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/news_gtk.c
 | 
17
++++++++++++++++-

4 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-18 [pawel]	3.7.3cvs16
+
+	* src/news_gtk.c
+		Fix Bug 2057 'Claws mail does not keep renamed names
+		of nntp-subscribed groups'
+		Check for already subscribed group using item->path for group
+		comparision as folders item->path != item->name may be truth 
+		since we allowed renaming of newsgroups folders -> 3.5.0cvs11
+
 2009-11-17 [pawel]	3.7.3cvs15
 
 	* Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
@@ -3889,3 +3889,4 @@
 ( cvs diff -u -r 1.60.2.134 -r 1.60.2.135 src/addressbook.c;  cvs diff -u -r 1.382.2.524 -r 1.382.2.525 src/compose.c;  cvs diff -u -r 1.50.2.55 -r 1.50.2.56 src/compose.h;  cvs diff -u -r 1.60.2.53 -r 1.60.2.54 src/filtering.c;  ) > 3.7.3cvs13.patchset
 ( cvs diff -u -r 1.30.2.57 -r 1.30.2.58 src/prefs_toolbar.c;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/prefs_toolbar.h;  cvs diff -u -r 1.43.2.110 -r 1.43.2.111 src/toolbar.c;  cvs diff -u -r 1.19.2.31 -r 1.19.2.32 src/toolbar.h;  ) > 3.7.3cvs14.patchset
 ( cvs diff -u -r 1.24.2.26 -r 1.24.2.27 Makefile.am;  ) > 3.7.3cvs15.patchset
+( cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/news_gtk.c;  ) > 3.7.3cvs16.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/news_gtk.c b/src/news_gtk.c
@@ -130,6 +130,21 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
 #undef SET_SENS
 }
 
+static FolderItem *news_find_child_item(FolderItem *item, const gchar *path)
+{
+	GNode *node;
+	FolderItem *child;
+
+	for (node = item->node->children; node != NULL; node = node->next) {
+		child = FOLDER_ITEM(node->data);
+		if (strcmp2(child->path, path) == 0) {
+			return child;
+		}
+	}
+
+	return NULL;
+}
+
 static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
 {
 	FolderView *folderview = (FolderView *)data;
@@ -201,7 +216,7 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
 		gchar *name = (gchar *)cur->data;
 		FolderUpdateData hookdata;
 
-		if (folder_find_child_item_by_name(rootitem, name) != NULL)
+		if (news_find_child_item(rootitem, name) != NULL)
 			continue;
 
 		newitem = folder_item_new(folder, name, name);