irc.ui: Userlist sorting now uses Unicode Collation Algorithm

diff --git a/extra/irc/ui/ui.factor b/extra/irc/ui/ui.factor
index e9b098a67c89ad80d2134b25c00cdf91d47ac600..f712e17afe766132ba81a8987780b7f9ea1b05fc 100755 (executable)
--- a/extra/irc/ui/ui.factor
+++ b/extra/irc/ui/ui.factor
@@ -3,7 +3,7 @@
 \r
 USING: accessors kernel threads combinators concurrency.mailboxes\r
        sequences strings hashtables splitting fry assocs hashtables colors\r
-       sorting qualified unicode.case math.order\r
+       sorting qualified unicode.collation math.order\r
        ui ui.gadgets ui.gadgets.panes ui.gadgets.editors\r
        ui.gadgets.scrollers ui.commands ui.gadgets.frames ui.gestures\r
        ui.gadgets.tabs ui.gadgets.grids ui.gadgets.packs ui.gadgets.labels\r
@@ -125,11 +125,8 @@ M: irc-message write-irc
 \r
 GENERIC: handle-inbox ( tab message -- )\r
 \r
-: lower-<=> ( x y -- <=> )\r
-    [ >lower ] bi@ <=> ;\r
-\r
 : value-labels ( assoc val -- seq )\r
-    '[ nip , = ] assoc-filter keys [ lower-<=> ] sort [ <label> ] map ;\r
+    '[ nip , = ] assoc-filter keys [ string<=> ] sort [ <label> ] map ;\r
 \r
 : add-gadget-color ( pack seq color -- pack )\r
     '[ , >>color add-gadget ] each ;\r