diff -r e119444a1119 -r 8f6ae5cfc9b9 stream.go --- a/stream.go Wed Dec 28 13:02:23 2011 -0700 +++ b/stream.go Wed Dec 28 13:05:59 2011 -0700 @@ -132,7 +132,7 @@ case "jabber:client presence": obj = &Presence{} default: - obj = &Unrecognized{} + obj = &Generic{} log.Printf("Ignoring unrecognized: %s %s\n", se.Name.Space, se.Name.Local) } @@ -145,7 +145,7 @@ } // BUG(cjyar) If it's a Stanza, use reflection to - // search for any Unrecognized elements and fill in + // search for any Generic elements and fill in // their attributes. // Put it on the channel. @@ -433,7 +433,7 @@ } else { clObj := &auth{XMLName: xml.Name{Space: nsSASL, Local: "failure"}, Any: - &Unrecognized{XMLName: xml.Name{Space: nsSASL, + &Generic{XMLName: xml.Name{Space: nsSASL, Local: "abort"}}} cl.xmlOut <- clObj } @@ -490,13 +490,13 @@ } // Send a request to bind a resource. RFC 3920, section 7. -func (cl *Client) bind(bind *Unrecognized) { +func (cl *Client) bind(bind *Generic) { res := cl.Jid.Resource msg := &Iq{Type: "set", Id: cl.NextId(), Any: - &Unrecognized{XMLName: xml.Name{Space: nsBind, Local: + &Generic{XMLName: xml.Name{Space: nsBind, Local: "bind"}}} if res != "" { - msg.Any.Any = &Unrecognized{XMLName: xml.Name{Local: + msg.Any.Any = &Generic{XMLName: xml.Name{Local: "resource"}, Chardata: res} } f := func(st Stanza) bool {