From cbc56bad2b9cf48be7dcef2c3c90be37d93cc267 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 18 Mar 2008 15:15:05 +0000
Subject: [PATCH] Make server passwords work

---
 src/core/networkconnection.cpp          | 4 ++++
 src/qtui/settingspages/servereditdlg.ui | 2 +-
 version.inc                             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 163f220d..43749bcd 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -347,6 +347,10 @@ void NetworkConnection::socketInitialized() {
     disconnectFromIrc();
     return;
   }
+  QString passwd = network()->serverList()[_lastUsedServerlistIndex].toMap()["Password"].toString();
+  if(!passwd.isEmpty()) {
+    putRawLine(serverEncode(QString("PASS %1").arg(passwd)));
+  }
   putRawLine(serverEncode(QString("NICK :%1").arg(identity->nicks()[0])));  // FIXME: try more nicks if error occurs
   putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
 }
diff --git a/src/qtui/settingspages/servereditdlg.ui b/src/qtui/settingspages/servereditdlg.ui
index ef42b8e1..80dac12a 100644
--- a/src/qtui/settingspages/servereditdlg.ui
+++ b/src/qtui/settingspages/servereditdlg.ui
@@ -59,7 +59,7 @@
      <item>
       <widget class="QLineEdit" name="password" >
        <property name="enabled" >
-        <bool>false</bool>
+        <bool>true</bool>
        </property>
        <property name="echoMode" >
         <enum>QLineEdit::Password</enum>
diff --git a/version.inc b/version.inc
index 123dcfc2..67b4af87 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-alpha4-pre";
   quasselDate = "2008-03-18";
-  quasselBuild = 642;
+  quasselBuild = 644;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 642;
-- 
2.20.1