uwaru/go-xmpp
1
0
Fork 0
forked from jshiffer/go-xmpp
Code Pull Requests Activity

Merge pull request #14 from gatlin/master

Browse Source 
Fixed an unmarshalling issue
This commit is contained in:
mattn 2012-06-17 17:24:07 -07:00
commit d92790f748
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
xmpp.go
View File

@ -119,7 +119,7 @@ func (c *Client) Close() error {
func (c *Client) init(user, passwd string) error { func (c *Client) init(user, passwd string) error {
// For debugging: the following causes the plaintext of the connection to be duplicated to stdout. // For debugging: the following causes the plaintext of the connection to be duplicated to stdout.
//c.p = xml.NewDecoder(tee{c.tls, os.Stdout}); //c.p = xml.NewDecoder(tee{c.tls, os.Stdout})
c.p = xml.NewDecoder(c.tls) c.p = xml.NewDecoder(c.tls)
a := strings.SplitN(user, "@", 2) a := strings.SplitN(user, "@", 2)
@ -315,16 +315,16 @@ type bindBind struct {
type clientMessage struct { type clientMessage struct {
XMLName xml.Name `xml:"jabber:client message"` XMLName xml.Name `xml:"jabber:client message"`
From string `xml:",attr"` From string `xml:"from,attr"`
Id string `xml:",attr"` Id string `xml:"id,attr"`
To string `xml:",attr"` To string `xml:"to,attr"`
Type string `xml:",attr"` // chat, error, groupchat, headline, or normal Type string `xml:"type,attr"` // chat, error, groupchat, headline, or normal
// These should technically be []clientText, // These should technically be []clientText,
// but string is much more convenient. // but string is much more convenient.
Subject string Subject string `xml:"subject"`
Body string Body string `xml:"body"`
Thread string Thread string `xml:"thread"`
} }
type clientText struct { type clientText struct {
@ -334,15 +334,15 @@ type clientText struct {
type clientPresence struct { type clientPresence struct {
XMLName xml.Name `xml:"jabber:client presence"` XMLName xml.Name `xml:"jabber:client presence"`
From string `xml:",attr"` From string `xml:"from,attr"`
Id string `xml:",attr"` Id string `xml:"id,attr"`
To string `xml:",attr"` To string `xml:"to,attr"`
Type string `xml:",attr"` // error, probe, subscribe, subscribed, unavailable, unsubscribe, unsubscribed Type string `xml:"type,attr"` // error, probe, subscribe, subscribed, unavailable, unsubscribe, unsubscribed
Lang string `xml:",attr"` Lang string `xml:"lang,attr"`
Show string // away, chat, dnd, xa Show string `xml:"show,attr"`// away, chat, dnd, xa
Status string // sb []clientText Status string `xml:"status,attr"`// sb []clientText
Priority string Priority string `xml:"priority,attr"`
Error *clientError Error *clientError
} }