--- a/src/irc_chan.c	Sun May 10 23:37:43 2009 +0300
+++ b/src/irc_chan.c	Thu May 14 21:45:28 2009 +0300
@@ -83,8 +83,7 @@
     struct irc_chan *chan = arg;
     err_t err;
 
-    // us?
-    if (irc_cmp_nick(line->source->nickname, chan->net->conn->nickname) == 0) {
+    if (irc_conn_self(chan->net->conn, line->source->nickname)) {
         // twiddle state
         chan->joining = false;
         chan->joined = true;
@@ -177,8 +176,7 @@
 
     const char *msg = line->args[1];
 
-    // us?
-    if (irc_cmp_nick(line->source->nickname, chan->net->conn->nickname) == 0) {
+    if (irc_conn_self(chan->net->conn, line->source->nickname)) {
         // twiddle state
         chan->joined = false;
         chan->parted = true;
@@ -217,8 +215,7 @@
     const char *target = line->args[1];
     const char *msg = line->args[2];
 
-    // us?
-    if (irc_cmp_nick(target, chan->net->conn->nickname) == 0) {
+    if (irc_conn_self(chan->net->conn, target)) {
         // twiddle state
         chan->joined = false;
         chan->kicked = true;