# HG changeset patch # User Chris Jones # Date 1356742573 25200 # Node ID 7c45fc3f524a9b8aac53c5f9e6cea57fe80ee8d0 # Parent a058e33c16668203f3964282c90f0b2f00900889 Put the sub-elements of Message and Presence into the jabber:client namespace. diff -r a058e33c1666 -r 7c45fc3f524a structs.go --- a/structs.go Fri Dec 28 17:07:20 2012 -0700 +++ b/structs.go Fri Dec 28 17:56:13 2012 -0700 @@ -96,11 +96,11 @@ // message stanza type Message struct { - XMLName xml.Name `xml:"message"` + XMLName xml.Name `xml:"jabber:client message"` Header - Subject *Generic `xml:"subject"` - Body *Generic `xml:"body"` - Thread *Generic `xml:"thread"` + Subject *Generic `xml:"jabber:client subject"` + Body *Generic `xml:"jabber:client body"` + Thread *Generic `xml:"jabber:client thread"` } var _ Stanza = &Message{} @@ -108,9 +108,9 @@ type Presence struct { XMLName xml.Name `xml:"presence"` Header - Show *Generic `xml:"show"` - Status *Generic `xml:"status"` - Priority *Generic `xml:"priority"` + Show *Generic `xml:"jabber:client show"` + Status *Generic `xml:"jabber:client status"` + Priority *Generic `xml:"jabber:client priority"` } var _ Stanza = &Presence{} diff -r a058e33c1666 -r 7c45fc3f524a structs_test.go --- a/structs_test.go Fri Dec 28 17:07:20 2012 -0700 +++ b/structs_test.go Fri Dec 28 17:56:13 2012 -0700 @@ -9,7 +9,9 @@ "encoding/xml" "fmt" "os" + "reflect" "runtime" + "strings" "testing" ) @@ -112,6 +114,30 @@ func TestMarshalEscaping(t *testing.T) { msg := &Message{Body: &Generic{XMLName: xml.Name{Local: "body"}, Chardata: `&