Ticket #7712: 0001-Fix-7712-Deskbar-item-sorting-is-not-locale-sensitiv.patch

src/apps/deskbar/BarApp.cpp

@@ -69 +69 @@
 #include "Utilities.h"
 
 
+BCollator gCollator;
+
 BLocker TBarApp::sSubscriberLock;
 BList TBarApp::sBarTeamInfoList;
 BList TBarApp::sSubscribers;

src/apps/deskbar/BarApp.h

@@ -37 +37 @@
 
 
 #include <Application.h>
+#include <Collator.h>
 
 #include "BarSettings.h"
 
@@ -77 +78 @@
 // update preferences message constant
 const uint32 kUpdatePreferences = 'Pref';
 
+extern BCollator gCollator;
+
 /* --------------------------------------------- */
 
 class BBitmap;

src/apps/deskbar/ExpandoMenuBar.cpp

@@ -110 +110 @@
 int
 TExpandoMenuBar::CompareByName(const void* first, const void* second)
 {
-    return strcasecmp((*(static_cast<BarTeamInfo* const*>(first)))->name,
+    return gCollator.Compare((*(static_cast<BarTeamInfo* const*>(first)))->name,
         (*(static_cast<BarTeamInfo* const*>(second)))->name);
 }
 
@@ -604 +604 @@
         int32 itemCount = CountItems();
         while (i < itemCount) {
             teamItem = dynamic_cast<TTeamMenuItem*>(ItemAt(i));
-            if (teamItem != NULL && strcasecmp(teamItem->Name(), name) > 0) {
+            if (teamItem != NULL
+                && gCollator.Compare(teamItem->Name(), name) > 0) {
                 AddItem(item, i);
                 break;
             }

src/apps/deskbar/TeamMenu.cpp

@@ -62 +62 @@
 int
 TTeamMenu::CompareByName(const void* first, const void* second)
 {
-    return strcasecmp((*(static_cast<BarTeamInfo* const*>(first)))->name,
+    return gCollator.Compare((*(static_cast<BarTeamInfo* const*>(first)))->name,
         (*(static_cast<BarTeamInfo* const*>(second)))->name);
 }
 

src/apps/deskbar/WindowMenu.cpp

@@ -140 +140 @@
                     TWindowMenuItem* item
                         = static_cast<TWindowMenuItem*>(ItemAt(addIndex));
                     if (item != NULL
-                        && strcasecmp(item->FullTitle(), wInfo->name) > 0)
+                        && gCollator.Compare(item->FullTitle(), wInfo->name) > 0)
                         break;
                 }