diff -r 5d721a565503 -r 872e936f9f3f structs.go --- a/structs.go Sun Dec 16 14:37:43 2012 -0700 +++ b/structs.go Sun Dec 16 15:15:59 2012 -0700 @@ -55,8 +55,8 @@ } type Features struct { - Starttls *starttls - Mechanisms mechs + Starttls *starttls `xml:"urn:ietf:params:xml:ns:xmpp-tls starttls"` + Mechanisms mechs `xml:"urn:ietf:params:xml:ns:xmpp-sasl mechanisms"` Bind *bindIq Session *Generic Any *Generic @@ -274,7 +274,7 @@ func (er *Error) Error() string { buf, err := xml.Marshal(er) if err != nil { - Warnf("double bad error: couldn't marshal error") + Warn.Logf("double bad error: couldn't marshal error") return "unreadable error" } return string(buf)