Mercurial > geeqie
comparison src/filedata.c @ 1007:4303ee1e88ec
Removed converting fd->name to utf8 from file_data_set_collate_keys(), because fd->name is utf8.
| author | bruclik |
|---|---|
| date | Thu, 28 Aug 2008 12:51:02 +0000 |
| parents | 3096a47232ec |
| children | 650c02c0c8ff |
comparison
equal
deleted
inserted
replaced
| 1006:45ce6c1f331e | 1007:4303ee1e88ec |
|---|---|
| 147 } | 147 } |
| 148 | 148 |
| 149 static void file_data_set_collate_keys(FileData *fd) | 149 static void file_data_set_collate_keys(FileData *fd) |
| 150 { | 150 { |
| 151 gchar *caseless_name; | 151 gchar *caseless_name; |
| 152 gchar *name = path_to_utf8(fd->name); | 152 |
| 153 | 153 caseless_name = g_utf8_casefold(fd->name, -1); |
| 154 caseless_name = g_utf8_casefold(name, -1); | |
| 155 | 154 |
| 156 g_free(fd->collate_key_name); | 155 g_free(fd->collate_key_name); |
| 157 g_free(fd->collate_key_name_nocase); | 156 g_free(fd->collate_key_name_nocase); |
| 158 | 157 |
| 159 #if GLIB_CHECK_VERSION(2, 8, 0) | 158 #if GLIB_CHECK_VERSION(2, 8, 0) |
| 160 fd->collate_key_name = g_utf8_collate_key_for_filename(name, -1); | 159 fd->collate_key_name = g_utf8_collate_key_for_filename(fd->name, -1); |
| 161 fd->collate_key_name_nocase = g_utf8_collate_key_for_filename(caseless_name, -1); | 160 fd->collate_key_name_nocase = g_utf8_collate_key_for_filename(caseless_name, -1); |
| 162 #else | 161 #else |
| 163 fd->collate_key_name = g_utf8_collate_key(name, -1); | 162 fd->collate_key_name = g_utf8_collate_key(fd->name, -1); |
| 164 fd->collate_key_name_nocase = g_utf8_collate_key(caseless_name, -1); | 163 fd->collate_key_name_nocase = g_utf8_collate_key(caseless_name, -1); |
| 165 #endif | 164 #endif |
| 166 g_free(caseless_name); | 165 g_free(caseless_name); |
| 167 g_free(name); | |
| 168 } | 166 } |
| 169 | 167 |
| 170 static void file_data_set_path(FileData *fd, const gchar *path) | 168 static void file_data_set_path(FileData *fd, const gchar *path) |
| 171 { | 169 { |
| 172 g_assert(path /* && *path*/); /* view_dir_tree uses FileData with zero length path */ | 170 g_assert(path /* && *path*/); /* view_dir_tree uses FileData with zero length path */ |