[Pound-commit] pound: 2 new changesets

[Mercurial C. M. <pou...@li...>]

details:   http://pound.hg.sourceforge.net:8000/hgroot/pound/pound/rev/54e0ef9599a4
changeset: 32:54e0ef9599a4
user:      rubin@snark
date:      Thu Jan 21 21:07:50 2010 -0600
description:
enable support for server passwords

details:   http://pound.hg.sourceforge.net:8000/hgroot/pound/pound/rev/f7aa719071cc
changeset: 33:f7aa719071cc
user:      rubin@snark
date:      Thu Jan 21 21:08:27 2010 -0600
description:
remove #linux from default channels

diffstat:

 app/assistants/first-assistant.js |  2 +-
 libs/irc.js                       |  7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r fcdc04776817 -r f7aa719071cc app/assistants/first-assistant.js
--- a/app/assistants/first-assistant.js	Sat Jan 16 10:05:05 2010 -0600
+++ b/app/assistants/first-assistant.js	Thu Jan 21 21:08:27 2010 -0600
@@ -31,7 +31,7 @@
     //TODO: we can get name from webos somehow right? Lets use that as default nick!
     return { 
          networks: [ 
-                     {name: "AfterNET", url: "http://www.afternet.org:6690", nick1: "Pound-user", autoJoin: "#linux,#afternet"},
+                     {name: "AfterNET", url: "http://www.afternet.org:6690", nick1: "Pound-user", autoJoin: "#afternet"},
                      {name: "Freenode", url: "http://webchat.freenode.net", nick1: "Pound-user", autoJoin: "#palm,#webos"},
                      {name: "QuakeNet", url: "http://webchat.quakenet.org", nick1: "Pound-user"},
                      {name: "Rizon",    url: "http://qchat.rizon.net/", nick1: "Pound-user"}, // untested..
diff -r fcdc04776817 -r f7aa719071cc libs/irc.js
--- a/libs/irc.js	Sat Jan 16 10:05:05 2010 -0600
+++ b/libs/irc.js	Thu Jan 21 21:08:27 2010 -0600
@@ -1115,7 +1115,12 @@
             this._ajaxSend({r: "blahblahblah3", t:this.timeCounter++, nick:this.prefNick, password: pass}, 'n');
         }
         else {
-            this._ajaxSend({r: "blahblahblah3", t:this.timeCounter++, nick:this.prefNick}, 'n');
+            if(this.options.serverPassword !== '') {
+                this._ajaxSend({r: "blahblahblah3", t:this.timeCounter++, password: this.options.serverPassword, nick:this.prefNick}, 'n');
+            } 
+            else {
+                this._ajaxSend({r: "blahblahblah3", t:this.timeCounter++, nick:this.prefNick}, 'n');
+            }
         }
     },
     quit: function(reason) {