Fix sorting of 0 sequences in filenames

This commit is contained in:
Matthias Clasen 2005-10-07 03:04:03 +00:00
parent a8b39bf42b
commit df2746311f
4 changed files with 26 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2005-10-06 Matthias Clasen <mclasen@redhat.com>
* glib/gunicollate.c (g_utf8_collate_key_for_filename): Handle
all-zero sequences correctly. (#317930, Sebastien Bacher)
2005-10-05 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_escape_text): Doc addition

View File

@ -1,3 +1,8 @@
2005-10-06 Matthias Clasen <mclasen@redhat.com>
* glib/gunicollate.c (g_utf8_collate_key_for_filename): Handle
all-zero sequences correctly. (#317930, Sebastien Bacher)
2005-10-05 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_escape_text): Doc addition

View File

@ -1,3 +1,8 @@
2005-10-06 Matthias Clasen <mclasen@redhat.com>
* glib/gunicollate.c (g_utf8_collate_key_for_filename): Handle
all-zero sequences correctly. (#317930, Sebastien Bacher)
2005-10-05 Matthias Clasen <mclasen@redhat.com>
* glib/gmarkup.c (g_markup_escape_text): Doc addition

View File

@ -415,7 +415,17 @@ g_utf8_collate_key_for_filename (const gchar *str,
else if (g_ascii_isdigit(*p))
++digits;
else
break;
{
/* count an all-zero sequence as
* one digit plus leading zeros
*/
if (!digits)
{
++digits;
--leading_zeros;
}
break;
}
}
while (*p != '\0');