ui.gadgets.tabs: Fixed error; irc.ui.commands: Added /me

diff --git a/extra/irc/ui/commands/commands.factor b/extra/irc/ui/commands/commands.factor
index 4bb77e7490c34b1d344ee3eba45d2947741a4adb..147d25bea5d7a26ff90f7427031036cbb9251163 100755 (executable)
--- a/extra/irc/ui/commands/commands.factor
+++ b/extra/irc/ui/commands/commands.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008 William Schlieper\r
 ! See http://factorcode.org/license.txt for BSD license.\r
 \r
-USING: accessors kernel arrays irc.client irc.messages irc.ui namespaces ;\r
+USING: accessors kernel sequences arrays irc.client\r
+       irc.messages irc.ui namespaces ;\r
 \r
 IN: irc.ui.commands\r
 \r
@@ -10,6 +11,9 @@ IN: irc.ui.commands
     [ window>> client>> profile>> nickname>> <own-message> print-irc ]\r
     [ chat>> speak ] 2bi ;\r
 \r
+: me ( string -- ) ! Placeholder until I make /me look different\r
+    "ACTION " 1 prefix prepend 1 suffix say ;\r
+\r
 : join ( string -- )\r
     irc-tab get window>> join-channel ;\r
 \r

diff --git a/extra/ui/gadgets/tabs/tabs.factor b/extra/ui/gadgets/tabs/tabs.factor
index 7e09d086c2154d1a27f17ffa89bc00484eacc8b4..0113e01ba73884e55f13fa851470f8ac96565f49 100755 (executable)
--- a/extra/ui/gadgets/tabs/tabs.factor
+++ b/extra/ui/gadgets/tabs/tabs.factor
@@ -12,9 +12,9 @@ TUPLE: tabbed < frame names toggler content ;
 \r
 DEFER: (del-page)\r
 \r
-:: add-toggle ( model n name toggler -- )\r
+:: add-toggle ( n name model toggler -- )\r
   <frame>\r
-    n name toggler parent>> '[ _ _ _ (del-page) ] "X" swap <bevel-button>\r
+    n name toggler parent>> '[ drop _ _ _ (del-page) ] "X" swap <bevel-button>\r
       @right grid-add\r
     n model name <toggle-button> @center grid-add\r
   toggler swap add-gadget drop ;\r
@@ -23,7 +23,7 @@ DEFER: (del-page)
      [ names>> ] [ model>> ] [ toggler>> ] tri\r
      [ clear-gadget ] keep\r
      [ [ length ] keep ] 2dip\r
-     '[ [ _ ] 2dip _ add-toggle ] 2each ;\r
+     '[ _ _ add-toggle ] 2each ;\r
 \r
 : refresh-book ( tabbed -- )\r
     model>> [ ] change-model ;\r
@@ -39,8 +39,8 @@ DEFER: (del-page)
 \r
 : add-page ( page name tabbed -- )\r
     [ names>> push ] 2keep\r
-    [ [ model>> swap ]\r
-      [ names>> length 1 - swap ]\r
+    [ [ names>> length 1 - swap ]\r
+      [ model>> ]\r
       [ toggler>> ] tri add-toggle ]\r
     [ content>> swap add-gadget drop ]\r
     [ refresh-book ] tri ;\r