2009-01-11 [colin] 3.7.0cvs30
authorColin Leroy <colin@colino.net>
Sun, 11 Jan 2009 12:32:51 +0000 (12:32 +0000)
committerColin Leroy <colin@colino.net>
Sun, 11 Jan 2009 12:32:51 +0000 (12:32 +0000)
* src/folder.c
folder_find_child_item_by_name():
actually use name, not path's basename

ChangeLog
PATCHSETS
configure.ac
src/folder.c

index 6870d204b9153068b142511b8f91b6e19825d675..f45ad852f918cf4e4cff3b9dccf7d489cb1a42b5 100644 (file)
--- 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
index 7ede64d818577ab9bba69b626edbd5999c947648..af8fb7d4e167c4fcb7f1a55eaa487c0d01994254 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index f54de871f6947fce0363f2b4c2f55f93b0de295a..e70e7328f30cad1da6a342e36c22a5601a2d74ca 100644 (file)
@@ -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=
 
index fe8a65dcea46fbc8a413f57a867667b78febee93..2a7c9320d047efac446787df26f10b904fac2e90 100644 (file)
@@ -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;