Merge branch 'master' of git://github.com/lye/cleanirc

Conflicts:
	irc.go
	irc_callback.go
	irc_struct.go

Merge Interesting changes from fork

irc_struct.go

@@ -5,23 +5,30 @@
 package irc
 
 import (
+	"crypto/tls"
 	"log"
 	"net"
-    "time"
+	"time"
 )
 
 type Connection struct {
+	Error     chan error
+	Log       chan string
+	Password  string
+	UseSSL    bool
+	SSLConfig *tls.Config
+
 	socket                 net.Conn
 	pread, pwrite          chan string
-	Error                  chan error
 	syncreader, syncwriter chan bool
-	nick                   string //The nickname we want.
-	nickcurrent            string //The nickname we currently have.
-	user                   string
-	registered             bool
-	server                 string
-	Password               string
-	events                 map[string][]func(*Event)
+	reconnecting           bool
+
+	nick        string //The nickname we want.
+	nickcurrent string //The nickname we currently have.
+	user        string
+	registered  bool
+	server      string
+	events      map[string][]func(*IRCEvent)
 
 	lastMessage time.Time
 	ticker      <-chan time.Time
@@ -34,13 +41,12 @@ type Connection struct {
 }
 
 type Event struct {
-	Code    string
-	Message string
-	Raw     string
-	Nick    string //<nick>
-	Host    string //<nick>!<usr>@<host>
-	Source  string //<host>
-	User    string //<usr>
-
+	Code      string
+	Message   string
+	Raw       string
+	Nick      string //<nick>
+	Host      string //<nick>!<usr>@<host>
+	Source    string //<host>
+	User      string //<usr>
 	Arguments []string
 }