Fix sorting of 0 sequences in filenames

diff --git a/ChangeLog b/ChangeLog
index 0533ede..a459357 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0533ede..a459357 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0533ede..a459357 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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

diff --git a/glib/gunicollate.c b/glib/gunicollate.c
index 2e66842..b00be88 100644 (file)
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -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');