talons

commit 07eb5a0d11a9a42516c9dba35970bd72b47344ff
parent ec3569214be8db44dad7eb90ce64e6e6461f6b62
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 11 Jan 2009 12:32:51 +0000

2009-01-11 [colin]	3.7.0cvs30

	* src/folder.c
		folder_find_child_item_by_name():
		actually use name, not path's basename

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/folder.c
 | 
6
+-----

4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-11 [colin]	3.7.0cvs30
+
+	* src/folder.c
+		folder_find_child_item_by_name():
+		actually use name, not path's basename
+
 2009-01-11 [paul]	3.7.0cvs29
 
 	* src/addrclip.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3691,3 +3691,4 @@
 ( cvs diff -u -r 1.65.2.65 -r 1.65.2.66 src/codeconv.c;  ) > 3.7.0cvs27.patchset
 ( cvs diff -u -r 1.4.2.73 -r 1.4.2.74 src/gtk/about.c;  ) > 3.7.0cvs28.patchset
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/addrclip.c;  cvs diff -u -r 1.28.2.38 -r 1.28.2.39 src/addrindex.c;  cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/addritem.c;  cvs diff -u -r 1.4.12.8 -r 1.4.12.9 src/foldersel.h;  cvs diff -u -r 1.207.2.210 -r 1.207.2.211 src/folderview.c;  cvs diff -u -r 1.52.2.71 -r 1.52.2.72 src/prefs_folder_item.c;  ) > 3.7.0cvs29.patchset
+( cvs diff -u -r 1.213.2.186 -r 1.213.2.187 src/folder.c;  ) > 3.7.0cvs30.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
@@ -1324,14 +1324,10 @@ FolderItem *folder_find_child_item_by_name(FolderItem *item, const gchar *name)
 	FolderItem *child;
 
 	for (node = item->node->children; node != NULL; node = node->next) {
-		gchar *base;
 		child = FOLDER_ITEM(node->data);
-		base = g_path_get_basename(child->path);
-		if (strcmp2(base, name) == 0) {
-			g_free(base);
+		if (strcmp2(child->name, name) == 0) {
 			return child;
 		}
-		g_free(base);
 	}
 
 	return NULL;