From 47d4587ca33b8adc110f28836e6bb2ea233207fc Mon Sep 17 00:00:00 2001
From: Alex Bramley <a.bramley@gmail.com>
Date: Thu, 28 Jul 2011 12:14:51 +0100
Subject: [PATCH] Revert "Weekly commits shouldn't be on release branch"

This reverts commit 934ee04fcfe075406a655363126ab6d33273cf3e.
---
 client/handlers.go | 4 ++--
 client/line.go     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/handlers.go b/client/handlers.go
index f0a582e..89d6312 100644
--- a/client/handlers.go
+++ b/client/handlers.go
@@ -220,7 +220,7 @@ func (conn *Conn) h_352(line *Line) {
 		// XXX: do we care about the actual server the nick is on?
 		//      or the hop count to this server?
 		// last arg contains "<hop count> <real name>"
-		a := strings.Split(line.Args[len(line.Args)-1], " ", 2)
+		a := strings.SplitN(line.Args[len(line.Args)-1], " ", 2)
 		n.Name = a[1]
 		if idx := strings.Index(line.Args[6], "*"); idx != -1 {
 			n.Modes.Oper = true
@@ -236,7 +236,7 @@ func (conn *Conn) h_352(line *Line) {
 // Handle 353 names reply
 func (conn *Conn) h_353(line *Line) {
 	if ch := conn.GetChannel(line.Args[2]); ch != nil {
-		nicks := strings.Split(line.Args[len(line.Args)-1], " ", -1)
+		nicks := strings.Split(line.Args[len(line.Args)-1], " ")
 		for _, nick := range nicks {
 			// UnrealIRCd's coders are lazy and leave a trailing space
 			if nick == "" {
diff --git a/client/line.go b/client/line.go
index 313d542..5934e65 100644
--- a/client/line.go
+++ b/client/line.go
@@ -41,7 +41,7 @@ func parseLine(s string) *Line {
 
 	// now we're here, we've parsed a :nick!user@host or :server off
 	// s should contain "cmd args[] :text"
-	args := strings.Split(s, " :", 2)
+	args := strings.SplitN(s, " :", 2)
 	if len(args) > 1 {
 		args = append(strings.Fields(args[0]), args[1])
 	} else {