Fixes issue #127, seems I never implemented this!

diff --git a/js/irc/commandparser.js b/js/irc/commandparser.js
index 3ef19dc1d594c46a66d2da75ce6541313696749c..cf9ed5c3c7e173740d63d4e8433e29d1feef55b2 100644 (file)
--- a/js/irc/commandparser.js
+++ b/js/irc/commandparser.js
@@ -22,7 +22,8 @@ qwebirc.irc.BaseCommandParser = new Class({
       this.parentObject.newActiveLine("OUR" + type, extra);
       return;
     } else if(window.type == qwebirc.ui.WINDOW_CHANNEL) {
-      type = "CHAN" + type;
+      this.parentObject.newChanLine(target, "OURCHAN" + type, null, extra);
+      return;
     } else {
       type = "PRIV" + type;
     }

diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js
index fff9ae735d44c569659b7f4b8a98186e7dd4bbbd..0356d4fe7f0521e4be858e862ceb64f012e1e259 100644 (file)
--- a/js/irc/ircclient.js
+++ b/js/irc/ircclient.js
@@ -41,11 +41,16 @@ qwebirc.irc.IRCClient = new Class({
     if(!extra)
       extra = {};
 
-    extra["n"] = user.hostToNick();
-    extra["h"] = user.hostToHost();
+    if($defined(user)) {
+      extra["n"] = user.hostToNick();
+      extra["h"] = user.hostToHost();
+    }
     extra["c"] = channel;
     extra["-"] = this.nickname;
     
+    if(!(this.ui.uiOptions.NICK_OV_STATUS))
+      delete extra["@"];
+      
     this.newLine(channel, type, extra);
   },
   newServerLine: function(type, data) {

diff --git a/js/ui/panes/options.js b/js/ui/panes/options.js
index ea244706d7de308154e15205131359003534624f..251b01d60ef0a4c8eb395111755289717f9cfc3a 100644 (file)
--- a/js/ui/panes/options.js
+++ b/js/ui/panes/options.js
@@ -26,7 +26,7 @@ qwebirc.config.DEFAULT_OPTIONS = [
   }],
   [2, "DEDICATED_MSG_WINDOW", "Send privmsgs to dedicated messages window", false],
   [4, "DEDICATED_NOTICE_WINDOW", "Send notices to dedicated message window", false],
-  [3, "NICK_OV_STATUS", "Show status (@/+) before nicknames in nicklist", true],
+  [3, "NICK_OV_STATUS", "Show status (@/+) before nicknames in channel lines", true],
   [5, "ACCEPT_SERVICE_INVITES", "Automatically join channels when invited by Q", true],
   [6, "USE_HIDDENHOST", "Hide your hostmask when authed to Q (+x)", true],
   [8, "LASTPOS_LINE", "Show a last position indicator for each window", true, {