From 1dd8c2eeac3498c8ce20e46c801ddad1d63910ee Mon Sep 17 00:00:00 2001
From: Gatlin C Johnson <rokenrol@gmail.com>
Date: Sat, 16 Jun 2012 14:39:22 -0500
Subject: [PATCH] fixed the xml tag unmarshalling for client messages

---
 xmpp.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xmpp.go b/xmpp.go
index 5e18f48..d1273a6 100644
--- a/xmpp.go
+++ b/xmpp.go
@@ -119,7 +119,7 @@ func (c *Client) Close() error {
 
 func (c *Client) init(user, passwd string) error {
 	// 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)
 
 	a := strings.SplitN(user, "@", 2)
@@ -315,16 +315,16 @@ type bindBind struct {
 
 type clientMessage struct {
 	XMLName xml.Name `xml:"jabber:client message"`
-	From    string   `xml:",attr"`
-	Id      string   `xml:",attr"`
-	To      string   `xml:",attr"`
-	Type    string   `xml:",attr"` // chat, error, groupchat, headline, or normal
+	From    string   `xml:"from,attr"`
+	Id      string   `xml:"id,attr"`
+	To      string   `xml:"to,attr"`
+	Type    string   `xml:"type,attr"` // chat, error, groupchat, headline, or normal
 
 	// These should technically be []clientText,
 	// but string is much more convenient.
-	Subject string
-	Body    string
-	Thread  string
+	Subject string `xml:"subject"`
+	Body    string `xml:"body"`
+	Thread  string `xml:"thread"`
 }
 
 type clientText struct {