talons

commit a2cda5427e23b3df2d86ab82a84d40797bd35d59
parent 9690829fbfd6c52b52e533116067316d978f2df4
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Wed, 18 Nov 2009 21:05:50 +0000

2009-11-18 [pawel]	3.7.3cvs17

	* src/news_gtk.c
		remove unneeded and code-duplicating function

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

4 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-18 [pawel]	3.7.3cvs17
+
+	* src/news_gtk.c
+		remove unneeded and code-duplicating function
+
 2009-11-18 [pawel]	3.7.3cvs16
 
 	* src/news_gtk.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3890,3 +3890,4 @@
 ( 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
+( cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/news_gtk.c;  ) > 3.7.3cvs17.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=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/news_gtk.c b/src/news_gtk.c
@@ -288,21 +288,6 @@ static void unsubscribe_newsgroup_cb(GtkAction *action, gpointer data)
 	g_free(old_id);
 }
 
-static FolderItem *find_child_by_name(FolderItem *item, const gchar *name)
-{
-	GNode *node;
-	FolderItem *child;
-
-	for (node = item->node->children; node != NULL; node = node->next) {
-		child = FOLDER_ITEM(node->data);
-		if (strcmp2(child->name, name) == 0) {
-			return child;
-		}
-	}
-
-	return NULL;
-}
-
 static void rename_newsgroup_cb(GtkAction *action, gpointer data)
 {
 	FolderView *folderview = (FolderView *)data;
@@ -331,7 +316,7 @@ static void rename_newsgroup_cb(GtkAction *action, gpointer data)
 		return;
 	}
 
-	if (find_child_by_name(folder_item_parent(item), new_folder)) {
+	if (folder_find_child_item_by_name(folder_item_parent(item), new_folder)) {
 		name = trim_string(new_folder, 32);
 		alertpanel_error(_("The folder '%s' already exists."), name);
 		g_free(name);