xmpp.go
changeset 26 4d0a369079ce
parent 23 b5de44679389
child 27 13bcc96a5a6c
--- a/xmpp.go	Wed Dec 28 13:32:11 2011 -0700
+++ b/xmpp.go	Wed Dec 28 15:47:27 2011 -0700
@@ -63,9 +63,6 @@
 	// channel.
 	Out chan<- Stanza
 	xmlOut chan<- interface{}
-	// BUG(cjyar) Remove this. Make a Stanza parser method
-	// available for use by interact.go and similar applications.
-	TextOut chan<- *string
 }
 var _ io.Closer = &Client{}
 
@@ -114,7 +111,6 @@
 	// Start the reader and writers that convert to and from XML.
 	xmlIn := startXmlReader(tlsr)
 	cl.xmlOut = startXmlWriter(tlsw)
-	textOut := startTextWriter(tlsw)
 
 	// Start the XMPP stream handler which filters stream-level
 	// events and responds to them.
@@ -127,13 +123,12 @@
 
 	cl.In = clIn
 	cl.Out = clOut
-	cl.TextOut = textOut
 
 	return cl, nil
 }
 
 func (c *Client) Close() os.Error {
-	tryClose(c.In, c.Out, c.TextOut)
+	tryClose(c.In, c.Out)
 	return nil
 }
 
@@ -157,12 +152,6 @@
 	return ch
 }
 
-func startTextWriter(w io.Writer) chan<- *string {
-	ch := make(chan *string)
-	go writeText(w, ch)
-	return ch
-}
-
 func (cl *Client) startStreamReader(xmlIn <-chan interface{}, srvOut chan<- interface{}) <-chan Stanza {
 	ch := make(chan Stanza)
 	go cl.readStream(xmlIn, ch)