Mercurial > geeqie.yaz
comparison src/pan-util.c @ 783:d6a7fb4b8e7c
replaced directory path with FileData* dir_fd
| author | nadvornik |
|---|---|
| date | Tue, 03 Jun 2008 19:44:19 +0000 |
| parents | 44128da39e13 |
| children | 1646720364cf |
comparison
equal
deleted
inserted
replaced
| 782:3f7a0420c293 | 783:d6a7fb4b8e7c |
|---|---|
| 206 if (n && strcmp(n, GQ_RC_DIR) == 0) return TRUE; | 206 if (n && strcmp(n, GQ_RC_DIR) == 0) return TRUE; |
| 207 | 207 |
| 208 return FALSE; | 208 return FALSE; |
| 209 } | 209 } |
| 210 | 210 |
| 211 GList *pan_list_tree(const gchar *path, SortType sort, gint ascend, | 211 GList *pan_list_tree(FileData *dir_fd, SortType sort, gint ascend, |
| 212 gint ignore_symlinks) | 212 gint ignore_symlinks) |
| 213 { | 213 { |
| 214 GList *flist; | 214 GList *flist; |
| 215 GList *dlist; | 215 GList *dlist; |
| 216 GList *result; | 216 GList *result; |
| 217 GList *folders; | 217 GList *folders; |
| 218 | 218 |
| 219 filelist_read(path, &flist, &dlist); | 219 filelist_read(dir_fd, &flist, &dlist); |
| 220 if (sort != SORT_NONE) | 220 if (sort != SORT_NONE) |
| 221 { | 221 { |
| 222 flist = filelist_sort(flist, sort, ascend); | 222 flist = filelist_sort(flist, sort, ascend); |
| 223 dlist = filelist_sort(dlist, sort, ascend); | 223 dlist = filelist_sort(dlist, sort, ascend); |
| 224 } | 224 } |
| 231 | 231 |
| 232 fd = folders->data; | 232 fd = folders->data; |
| 233 folders = g_list_remove(folders, fd); | 233 folders = g_list_remove(folders, fd); |
| 234 | 234 |
| 235 if (!pan_is_ignored(fd->path, ignore_symlinks) && | 235 if (!pan_is_ignored(fd->path, ignore_symlinks) && |
| 236 filelist_read(fd->path, &flist, &dlist)) | 236 filelist_read(fd, &flist, &dlist)) |
| 237 { | 237 { |
| 238 if (sort != SORT_NONE) | 238 if (sort != SORT_NONE) |
| 239 { | 239 { |
| 240 flist = filelist_sort(flist, sort, ascend); | 240 flist = filelist_sort(flist, sort, ascend); |
| 241 dlist = filelist_sort(dlist, sort, ascend); | 241 dlist = filelist_sort(dlist, sort, ascend); |