Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge...

[ardour.git] / gtk2_ardour / plugin_selector.cc

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 9c03bd5c4810c9a46577a212ee112ec05fedd553..f11753819a4405789c6fc524ac776982beba88c7 100644 (file)
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -36,6 +36,7 @@
 
 #include "ardour/plugin_manager.h"
 #include "ardour/plugin.h"
+#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "plugin_selector.h"
@@ -537,13 +538,13 @@ struct PluginMenuCompareByCreator {
     bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
            int cmp;
 
-           cmp = g_strcasecmp (a->creator.c_str(), b->creator.c_str());
+           cmp = cmp_nocase_utf8 (a->creator, b->creator);
 
            if (cmp < 0) {
                    return true;
            } else if (cmp == 0) {
                    /* same creator ... compare names */
-                   if (g_strcasecmp (a->name.c_str(), b->name.c_str()) < 0) {
+                   if (cmp_nocase_utf8 (a->name, b->name) < 0) {
                            return true;
                    }
            }
@@ -555,7 +556,7 @@ struct PluginMenuCompareByName {
     bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
            int cmp;
 
-           cmp = g_strcasecmp (a->name.c_str(), b->name.c_str());
+           cmp = cmp_nocase_utf8 (a->name, b->name);
 
            if (cmp < 0) {
                    return true;
@@ -573,13 +574,13 @@ struct PluginMenuCompareByCategory {
     bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
            int cmp;
 
-           cmp = g_strcasecmp (a->category.c_str(), b->category.c_str());
+           cmp = cmp_nocase_utf8 (a->category, b->category);
 
            if (cmp < 0) {
                    return true;
            } else if (cmp == 0) {
                    /* same category ... compare names */
-                   if (g_strcasecmp (a->name.c_str(), b->name.c_str()) < 0) {
+                   if (cmp_nocase_utf8 (a->name, b->name) < 0) {
                            return true;
                    }
            }