Mercurial > geeqie.yaz
comparison src/img-view.c @ 780:44128da39e13
Drop initialization to NULL since filelist_read() will take care of it.
author | zas_ |
---|---|
date | Tue, 03 Jun 2008 11:24:16 +0000 |
parents | 477f48ba28d8 |
children | 2d2cca2bceb0 |
comparison
equal
deleted
inserted
replaced
779:8b21337bc47b | 780:44128da39e13 |
---|---|
935 collection_unref(cd); | 935 collection_unref(cd); |
936 } | 936 } |
937 | 937 |
938 void view_window_new(FileData *fd) | 938 void view_window_new(FileData *fd) |
939 { | 939 { |
940 GList *list; | |
941 | |
940 if (file_extension_match(fd->path, ".gqv")) | 942 if (file_extension_match(fd->path, ".gqv")) |
941 { | 943 { |
942 ViewWindow *vw; | 944 ViewWindow *vw; |
943 CollectionData *cd; | 945 CollectionData *cd; |
944 CollectInfo *info; | 946 CollectInfo *info; |
959 { | 961 { |
960 g_signal_connect(G_OBJECT(vw->window), "destroy", | 962 g_signal_connect(G_OBJECT(vw->window), "destroy", |
961 G_CALLBACK(view_window_collection_unref_cb), cd); | 963 G_CALLBACK(view_window_collection_unref_cb), cd); |
962 } | 964 } |
963 } | 965 } |
964 else if (isdir(fd->path)) | 966 else if (isdir(fd->path) && filelist_read(fd->path, &list, NULL)) |
965 { | 967 { |
966 GList *list = NULL; | 968 list = filelist_sort_path(list); |
967 | 969 list = filelist_filter(list, FALSE); |
968 if (filelist_read(fd->path, &list, NULL)) | |
969 { | |
970 list = filelist_sort_path(list); | |
971 list = filelist_filter(list, FALSE); | |
972 } | |
973 real_view_window_new(NULL, list, NULL, NULL); | 970 real_view_window_new(NULL, list, NULL, NULL); |
974 filelist_free(list); | 971 filelist_free(list); |
975 } | 972 } |
976 else | 973 else |
977 { | 974 { |