/away shouldn't go to status, don't display nickchanges in status window if we're...

diff --git a/js/irc/baseircclient.js b/js/irc/baseircclient.js
index d53c261cbbad93c9cd5fa3454e8786780ccee2c0..966b19576d5745a7a6bdbeeeebc8fdcc19eaacdb 100644 (file)
--- a/js/irc/baseircclient.js
+++ b/js/irc/baseircclient.js
@@ -396,8 +396,10 @@ qwebirc.irc.BaseIRCClient = new Class({
   },
   irc_RPL_NOWAWAY: function(prefix, params) {
     this.awayStatus(true, params.indexFromEnd(-1));
+    return true;
   },
   irc_RPL_UNAWAY: function(prefix, params) {
     this.awayStatus(false, params.indexFromEnd(-1));
+    return true;
   }
 });

diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js
index 45ce5dd318d1785dc045cf00ba77d2429016c7b3..e6d1e53d719c89d1383b692a99fac04dc38ecf87 100644 (file)
--- a/js/irc/ircclient.js
+++ b/js/irc/ircclient.js
@@ -235,14 +235,18 @@ qwebirc.irc.IRCClient = new Class({
     this.tracker.renameNick(oldnick, newnick);
 
     var channels = this.tracker.getNick(newnick);
+    var found = false;
     
     for(var c in channels) {
+      var found = true;
+      
       this.newChanLine(c, "NICK", user, {"w": newnick});
       /* TODO: rename queries */
       this.updateNickList(c);
     }
 
-    this.newChanLine(undefined, "NICK", user, {"w": newnick});
+    if(!found)
+      this.newChanLine(undefined, "NICK", user, {"w": newnick});
   },
   channelTopic: function(user, channel, topic) {
     this.newChanLine(channel, "TOPIC", user, {"m": topic});