sidebar-sorted: use strcoll() to sort the sidebar using the locale settings of the...

diff --git a/debian/changelog b/debian/changelog
index c332e66d28b494dfa50d928cca49dcae4c5914d6..35b41fb492b75d3e23c49772a4de2eac8f8a0fe7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mutt (1.5.21-5) unstable; urgency=low
       (Closes: 619822)
     + sidebar-{dotted,sorted}: documented the options that those two patches are
       introducing; documentation submitted by Julien Valroff (Closes: 603186)
+    + sidebar-sorted: use strcoll() to sort the sidebar using the locale
+      settings of the system, patch by Arnaud Riess (Closes: 589240)
     + multiple-fccs: added a patch that allows multiple FCC separated by commas,
       written by Omen Wild (Closes: 586454)
 

diff --git a/debian/patches/mutt-patched/sidebar-sorted b/debian/patches/mutt-patched/sidebar-sorted
index 6e5aa4eea1bd0f5c044bb7bdfa50ff094c30d7a9..c5211b8ff84c69dcdae5fe148960ce032ae17a7e 100644 (file)
--- a/debian/patches/mutt-patched/sidebar-sorted
+++ b/debian/patches/mutt-patched/sidebar-sorted
@@ -26,7 +26,7 @@ should be easy to adopt it to a vanilla mutt.
 +                      needsort=0;
 +                      tmp = Incoming;
 +                      for ( ; tmp ; tmp=tmp->next ) {
-+                              if (tmp->next != NULL && strcmp(tmp->path, tmp->next->path) > 0) {
++                              if (tmp->next != NULL && strcoll(tmp->path, tmp->next->path) > 0) {
 +                                      needsort=1;
 +                                      prev = tmp->prev;
 +                                      next = tmp->next;