projects
/
geeqie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
efc8096
)
fixed filelist_sort_compare_filedata to not return 0 no different files
author
Vladimir Nadvornik
<nadvornik@suse.cz>
Fri, 30 Sep 2011 21:57:31 +0000
(23:57 +0200)
committer
Vladimir Nadvornik
<nadvornik@suse.cz>
Fri, 30 Sep 2011 21:57:31 +0000
(23:57 +0200)
src/filedata.c
patch
|
blob
|
history
diff --git
a/src/filedata.c
b/src/filedata.c
index
f6e3896
..
78fd74e
100644
(file)
--- a/
src/filedata.c
+++ b/
src/filedata.c
@@
-852,6
+852,7
@@
static gboolean filelist_sort_ascend = TRUE;
gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
{
gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
{
+ gint ret;
if (!filelist_sort_ascend)
{
FileData *tmp = fa;
if (!filelist_sort_ascend)
{
FileData *tmp = fa;
@@
-875,7
+876,8
@@
gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
break;
#ifdef HAVE_STRVERSCMP
case SORT_NUMBER:
break;
#ifdef HAVE_STRVERSCMP
case SORT_NUMBER:
- return strverscmp(fa->name, fb->name);
+ ret = strverscmp(fa->name, fb->name);
+ if (ret != 0) return ret;
break;
#endif
default:
break;
#endif
default:
@@
-883,9
+885,16
@@
gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
}
if (options->file_sort.case_sensitive)
}
if (options->file_sort.case_sensitive)
- ret
urn
strcmp(fa->collate_key_name, fb->collate_key_name);
+ ret
=
strcmp(fa->collate_key_name, fb->collate_key_name);
else
else
- return strcmp(fa->collate_key_name_nocase, fb->collate_key_name_nocase);
+ ret = strcmp(fa->collate_key_name_nocase, fb->collate_key_name_nocase);
+
+ if (ret != 0) return ret;
+
+ /* do not return 0 unless the files are really the same
+ file_data_pool ensures that original_path is unique
+ */
+ return strcmp(fa->original_path, fb->original_path);
}
gint filelist_sort_compare_filedata_full(FileData *fa, FileData *fb, SortType method, gboolean ascend)
}
gint filelist_sort_compare_filedata_full(FileData *fa, FileData *fb, SortType method, gboolean ascend)