From f04c5f9c7fa91ccd1ce38c792fd18d180e0e6271 Mon Sep 17 00:00:00 2001
From: William Schlieper <schlieper@unc.edu>
Date: Sun, 3 Aug 2008 20:29:53 -0400
Subject: [PATCH 1/3] irc.ui: Fixed userlist sorting bug

---
 extra/irc/ui/ui.factor | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extra/irc/ui/ui.factor b/extra/irc/ui/ui.factor
index 0c9fdee6e0..e9b098a67c 100755
--- a/extra/irc/ui/ui.factor
+++ b/extra/irc/ui/ui.factor
@@ -125,8 +125,11 @@ M: irc-message write-irc
 
 GENERIC: handle-inbox ( tab message -- )
 
+: lower-<=> ( x y -- <=> )
+    [ >lower ] bi@ <=> ;
+
 : value-labels ( assoc val -- seq )
-    '[ nip , = ] assoc-filter keys [ >lower <=> ] sort [ <label> ] map ;
+    '[ nip , = ] assoc-filter keys [ lower-<=> ] sort [ <label> ] map ;
 
 : add-gadget-color ( pack seq color -- pack )
     '[ , >>color add-gadget ] each ;

From cbb4a67560352f7d9535749324208c8578ff5a5a Mon Sep 17 00:00:00 2001
From: William Schlieper <schlieper@unc.edu>
Date: Sun, 3 Aug 2008 20:35:23 -0400
Subject: [PATCH 2/3] irc.ui: Userlist sorting now uses Unicode Collation
 Algorithm

---
 extra/irc/ui/ui.factor | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

From e253fe06d4dd961b7667e0fa07bb5b5f418d066c Mon Sep 17 00:00:00 2001
From: William Schlieper <schlieper@unc.edu>
Date: Mon, 4 Aug 2008 15:44:40 -0400
Subject: [PATCH 3/3] Kick messages now supported

---
 extra/irc/ui/ui.factor | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/extra/irc/ui/ui.factor b/extra/irc/ui/ui.factor
index f712e17afe..a524168d54 100755
--- a/extra/irc/ui/ui.factor
+++ b/extra/irc/ui/ui.factor
@@ -76,6 +76,14 @@ M: quit write-irc
     " has left IRC" dark-red write-color
     trailing>> dot-or-parens dark-red write-color ;
 
+M: kick write-irc
+    "* " dark-red write-color
+    [ prefix>> parse-name write ] keep
+    " has kicked " dark-red write-color
+    [ who>> write ] keep
+    " from the channel" dark-red write-color
+    trailing>> dot-or-parens dark-red write-color ;
+
 : full-mode ( message -- mode )
     parameters>> rest " " sjoin ;
 
@@ -126,7 +134,7 @@ M: irc-message write-irc
 GENERIC: handle-inbox ( tab message -- )
 
 : value-labels ( assoc val -- seq )
-    '[ nip , = ] assoc-filter keys [ string<=> ] sort [ <label> ] map ;
+    '[ nip , = ] assoc-filter keys sort-strings [ <label> ] map ;
 
 : add-gadget-color ( pack seq color -- pack )
     '[ , >>color add-gadget ] each ;