go-xmpp2: comparison structs.go

equal deleted inserted replaced

-:e119444a1119
+:8f6ae5cfc9b9
 // BUG(cjyar) Store this in Client and make it available to the app.
 type Features struct {
 	Starttls *starttls
 	Mechanisms mechs
-	Bind *Unrecognized
+	Bind *Generic
 }
 type starttls struct {
 	XMLName xml.Name
 	Required *string
 type auth struct {
 	XMLName xml.Name
 	Chardata string `xml:"chardata"`
 	Mechanism string `xml:"attr"`
-	Any *Unrecognized
+	Any *Generic
 }
 // One of the three core XMPP stanza types: iq, message, presence. See
 // RFC3920, section 9.
 type Stanza interface {
 	// The xml:lang attribute.
 	XLang() string
 	// A nested error element, if any.
 	XError() *Error
 	// A (non-error) nested element, if any.
-	XChild() *Unrecognized
+	XChild() *Generic
 }
 // message stanza
 type Message struct {
 	To string `xml:"attr"`
 	From string `xml:"attr"`
 	Id string `xml:"attr"`
 	Type string `xml:"attr"`
 	Lang string `xml:"attr"`
 	Error *Error
-	Any *Unrecognized
+	Any *Generic
 }
 var _ xml.Marshaler = &Message{}
 var _ Stanza = &Message{}
 // presence stanza
 	From string `xml:"attr"`
 	Id string `xml:"attr"`
 	Type string `xml:"attr"`
 	Lang string `xml:"attr"`
 	Error *Error
-	Any *Unrecognized
+	Any *Generic
 }
 var _ xml.Marshaler = &Presence{}
 var _ Stanza = &Presence{}
 // iq stanza
 	From string `xml:"attr"`
 	Id string `xml:"attr"`
 	Type string `xml:"attr"`
 	Lang string `xml:"attr"`
 	Error *Error
-	Any *Unrecognized
+	Any *Generic
 }
 var _ xml.Marshaler = &Iq{}
 var _ Stanza = &Iq{}
 // Describes an XMPP stanza error. See RFC 3920, Section 9.3.
 type Error struct {
 	// The error type attribute.
 	Type string `xml:"attr"`
 	// Any nested element, if present.
-	Any *Unrecognized
+	Any *Generic
 }
 var _ xml.Marshaler = &Error{}
 // Holds an XML element not described by the more specific types.
-// BUG(cjyar) Rename this to something like Generic.
+type Generic struct {
-type Unrecognized struct {
 	XMLName xml.Name
-	Any *Unrecognized
+	Any *Generic
 	Chardata string `xml:"chardata"`
 }
-var _ fmt.Stringer = &Unrecognized{}
+var _ fmt.Stringer = &Generic{}
 func (jid *JID) String() string {
 	result := jid.Domain
 	if jid.Node != nil {
 		result = *jid.Node + "@" + result
 		xml.Escape(w, []byte(value))
 		io.WriteString(w, `"`)
 	}
 }
-func (u *Unrecognized) String() string {
+func (u *Generic) String() string {
 	var sub string
 	if u.Any != nil {
 		sub = u.Any.String()
 	}
 	return fmt.Sprintf("<%s %s>%s%s</%s %s>", u.XMLName.Space,
 func (m *Message) XError() *Error {
 	return m.Error
 }
-func (m *Message) XChild() *Unrecognized {
+func (m *Message) XChild() *Generic {
 	return m.Any
 }
 func (m *Message) MarshalXML() ([]byte, os.Error) {
 	return marshalXML(m)
 func (p *Presence) XError() *Error {
 	return p.Error
 }
-func (p *Presence) XChild() *Unrecognized {
+func (p *Presence) XChild() *Generic {
 	return p.Any
 }
 func (p *Presence) MarshalXML() ([]byte, os.Error) {
 	return marshalXML(p)
 func (iq *Iq) XError() *Error {
 	return iq.Error
 }
-func (iq *Iq) XChild() *Unrecognized {
+func (iq *Iq) XChild() *Generic {
 	return iq.Any
 }
 func (iq *Iq) MarshalXML() ([]byte, os.Error) {
 	return marshalXML(iq)

changeset 21	8f6ae5cfc9b9
parent 20	e119444a1119
child 22	d6b7b4cbf50d