From 4e7d9e68d11fea419d006a193e639969e552fbea Mon Sep 17 00:00:00 2001
From: Matt Goodall <matt.goodall@gmail.com>
Date: Wed, 27 Jun 2012 13:15:11 +0100
Subject: [PATCH] Move xml declaration to stream.

---
 src/xmpp/client.go    | 4 ----
 src/xmpp/component.go | 4 ----
 src/xmpp/stream.go    | 4 ++++
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/xmpp/client.go b/src/xmpp/client.go
index 828e007..fda67a9 100644
--- a/src/xmpp/client.go
+++ b/src/xmpp/client.go
@@ -25,10 +25,6 @@ func NewClient(jid JID, password string, config *ClientConfig) (*client, error)
 		return nil, err
 	}
 
-	if err := stream.Send("<?xml version='1.0'?>\n"); err != nil {
-		return nil, err
-	}
-
 	for {
 		// Send stream start.
 		s := fmt.Sprintf(
diff --git a/src/xmpp/component.go b/src/xmpp/component.go
index fb5d57f..fe2fb58 100644
--- a/src/xmpp/component.go
+++ b/src/xmpp/component.go
@@ -20,10 +20,6 @@ func NewComponent(addr string, jid JID, secret string) (*component, error) {
 		return nil, err
 	}
 
-	if err := stream.Send("<?xml version='1.0'?>"); err != nil {
-		return nil, err
-	}
-
 	streamId, err := startComponent(stream, jid)
 	if err != nil {
 		return nil, err
diff --git a/src/xmpp/stream.go b/src/xmpp/stream.go
index c1acaa6..cc570c8 100644
--- a/src/xmpp/stream.go
+++ b/src/xmpp/stream.go
@@ -28,6 +28,10 @@ func NewStream(addr string) (*Stream, error) {
 		return nil, err
 	}
 
+	if _, err := conn.Write([]byte("<?xml version='1.0'?>")); err != nil {
+		return nil, err
+	}
+
 	dec := xml.NewDecoder(conn)
 	return &Stream{conn, dec}, nil
 }