Mercurial > geeqie
comparison src/bar_sort.c @ 576:9dc0513837b5
dropped path_list functions, use filelist functions everywhere
author | nadvornik |
---|---|
date | Sun, 04 May 2008 21:54:20 +0000 |
parents | 57007e49d767 |
children | 905688aa2317 |
comparison
equal
deleted
inserted
replaced
575:b941403a4cd9 | 576:9dc0513837b5 |
---|---|
93 | 93 |
94 history_list_free_key(SORT_KEY_COLLECTIONS); | 94 history_list_free_key(SORT_KEY_COLLECTIONS); |
95 bookmark_list_set_key(bookmarks, SORT_KEY_COLLECTIONS); | 95 bookmark_list_set_key(bookmarks, SORT_KEY_COLLECTIONS); |
96 | 96 |
97 collect_path = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, NULL); | 97 collect_path = g_strconcat(homedir(), "/", GQ_RC_DIR_COLLECTIONS, NULL); |
98 path_list(collect_path, &list, NULL); | 98 filelist_read(collect_path, &list, NULL); |
99 g_free(collect_path); | 99 g_free(collect_path); |
100 | 100 |
101 list = path_list_sort(list); | 101 list = filelist_sort_path(list); |
102 | 102 |
103 work = list; | 103 work = list; |
104 while (work) | 104 while (work) |
105 { | 105 { |
106 const gchar *path; | 106 FileData *fd; |
107 gchar *name; | 107 gchar *name; |
108 | 108 |
109 path = work->data; | 109 fd = work->data; |
110 work = work->next; | 110 work = work->next; |
111 | 111 |
112 if (file_extension_match(path, ".gqv")) | 112 if (file_extension_match(fd->path, ".gqv")) |
113 { | 113 { |
114 name = remove_extension_from_path(filename_from_path(path)); | 114 name = remove_extension_from_path(fd->name); |
115 } | 115 } |
116 else | 116 else |
117 { | 117 { |
118 name = g_strdup(filename_from_path(path)); | 118 name = g_strdup(fd->name); |
119 } | 119 } |
120 bookmark_list_add(bookmarks, name, path); | 120 bookmark_list_add(bookmarks, name, fd->path); |
121 g_free(name); | 121 g_free(name); |
122 } | 122 } |
123 | 123 |
124 string_list_free(list); | 124 filelist_free(list); |
125 } | 125 } |
126 | 126 |
127 static void bar_sort_mode_sync(SortData *sd, SortModeType mode) | 127 static void bar_sort_mode_sync(SortData *sd, SortModeType mode) |
128 { | 128 { |
129 gint folder_mode; | 129 gint folder_mode; |