From 72de2ff4fa7e093eb0892fa9a314c50cb4bf2d06 Mon Sep 17 00:00:00 2001
From: "U-WSCHLIEP-PC\\wschliep" <wschliep@wschliep-pc.(none)>
Date: Sat, 22 Nov 2008 23:11:44 -0500
Subject: [PATCH] ui.gadgets.tabs: Fixed error; irc.ui.commands: Added /me

---
 extra/irc/ui/commands/commands.factor |  6 +++++-
 extra/ui/gadgets/tabs/tabs.factor     | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extra/irc/ui/commands/commands.factor b/extra/irc/ui/commands/commands.factor
index 4bb77e7490..147d25bea5 100755
--- a/extra/irc/ui/commands/commands.factor
+++ b/extra/irc/ui/commands/commands.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 William Schlieper
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: accessors kernel arrays irc.client irc.messages irc.ui namespaces ;
+USING: accessors kernel sequences arrays irc.client
+       irc.messages irc.ui namespaces ;
 
 IN: irc.ui.commands
 
@@ -10,6 +11,9 @@ IN: irc.ui.commands
     [ window>> client>> profile>> nickname>> <own-message> print-irc ]
     [ chat>> speak ] 2bi ;
 
+: me ( string -- ) ! Placeholder until I make /me look different
+    "ACTION " 1 prefix prepend 1 suffix say ;
+
 : join ( string -- )
     irc-tab get window>> join-channel ;
 
diff --git a/extra/ui/gadgets/tabs/tabs.factor b/extra/ui/gadgets/tabs/tabs.factor
index 7e09d086c2..0113e01ba7 100755
--- a/extra/ui/gadgets/tabs/tabs.factor
+++ b/extra/ui/gadgets/tabs/tabs.factor
@@ -12,9 +12,9 @@ TUPLE: tabbed < frame names toggler content ;
 
 DEFER: (del-page)
 
-:: add-toggle ( model n name toggler -- )
+:: add-toggle ( n name model toggler -- )
   <frame>
-    n name toggler parent>> '[ _ _ _ (del-page) ] "X" swap <bevel-button>
+    n name toggler parent>> '[ drop _ _ _ (del-page) ] "X" swap <bevel-button>
       @right grid-add
     n model name <toggle-button> @center grid-add
   toggler swap add-gadget drop ;
@@ -23,7 +23,7 @@ DEFER: (del-page)
      [ names>> ] [ model>> ] [ toggler>> ] tri
      [ clear-gadget ] keep
      [ [ length ] keep ] 2dip
-     '[ [ _ ] 2dip _ add-toggle ] 2each ;
+     '[ _ _ add-toggle ] 2each ;
 
 : refresh-book ( tabbed -- )
     model>> [ ] change-model ;
@@ -39,8 +39,8 @@ DEFER: (del-page)
 
 : add-page ( page name tabbed -- )
     [ names>> push ] 2keep
-    [ [ model>> swap ]
-      [ names>> length 1 - swap ]
+    [ [ names>> length 1 - swap ]
+      [ model>> ]
       [ toggler>> ] tri add-toggle ]
     [ content>> swap add-gadget drop ]
     [ refresh-book ] tri ;