From 587a3865bdfeacd456b7aea3d38fa0329f4af3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= <kaeza@users.sf.net>
Date: Wed, 26 Dec 2012 19:13:00 -0200
Subject: [PATCH] Testing

---
 src/callback.lua   | 1 +
 src/init.lua       | 2 +-
 src/luairc/irc.lua | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/callback.lua b/src/callback.lua
index eb8b6d1..f808395 100644
--- a/src/callback.lua
+++ b/src/callback.lua
@@ -62,6 +62,7 @@ irc.register_callback("private_msg", function ( from, message )
         return;
     else
         irc.say(from, 'Message not sent! Please use "!help" to see possible commands.');
+        irc.say(from, '    Or use the ">playername Message" syntax to send a private message.');
         return;
     end
     if (not mt_irc.connected_players[player_to]) then
diff --git a/src/init.lua b/src/init.lua
index ff733bb..9e70c3a 100644
--- a/src/init.lua
+++ b/src/init.lua
@@ -108,7 +108,7 @@ mt_irc.join = function ( name )
 end
 
 mt_irc.connect = function ( )
-    mt_irc.connect_ok = pcall(irc.connect, {
+    mt_irc.connect_ok = irc.connect({
         network = mt_irc.server;
         port = mt_irc.port;
         nick = mt_irc.server_nick;
diff --git a/src/luairc/irc.lua b/src/luairc/irc.lua
index 336a346..bf1c3af 100644
--- a/src/luairc/irc.lua
+++ b/src/luairc/irc.lua
@@ -705,7 +705,9 @@ function connect(args)
     serverinfo.connecting = true
     if OUTFILE then irc_debug.set_output(OUTFILE) end
     if DEBUG then irc_debug.enable() end
-    irc_sock = base.assert(socket.connect(network, port))
+    --irc_sock = base.assert(socket.connect(network, port))
+    irc_sock = socket.connect(network, port);
+    if (not irc_sock) then return false; end
     irc_sock:settimeout(timeout)
     _register_socket(irc_sock, 'r', incoming_message)
     _register_socket(irc_sock, 'w', outgoing_message)
@@ -713,6 +715,7 @@ function connect(args)
     send("NICK", nick)
     send("USER", username, get_ip(), network, realname)
     --begin_main_loop()
+    return true, irc_sock;
 end
 -- }}}