2004-11-13 [paul] 0.9.12cvs146.7

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index f50b6d784a97fd74a0f217b185af64552d7c3244..0c6bae35084ca74b6c1f933652cbc85dfdddc745 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1063,8 +1063,10 @@ FolderItem *folder_find_child_item_by_name(FolderItem *item, const gchar *name)
 
        for (node = item->node->children; node != NULL; node = node->next) {
                child = FOLDER_ITEM(node->data);
-               if (strcmp2(g_basename(child->path), name) == 0)
+               if (strcmp2(g_path_get_basename(child->path), name) == 0) {
+                       g_free(child->path);
                        return child;
+               }
        }
 
        return NULL;
@@ -2524,7 +2526,10 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        }
 
        phys_srcpath = folder_item_get_path(src);
-       phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
+       phys_dstpath = g_strconcat(folder_item_get_path(dest),
+                      G_DIR_SEPARATOR_S,
+                      g_path_get_basename(phys_srcpath),
+                      NULL);
 
        if (folder_item_parent(src) == dest || src == dest) {
                g_free(src_identifier);