From c72f6cf508fdc5ffe2619d465e2a510983fb9e33 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Tue, 3 May 2011 16:38:45 -0400
Subject: [PATCH] fix merge config changes

---
 src/sip/jreen/jabber.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sip/jreen/jabber.cpp b/src/sip/jreen/jabber.cpp
index 6ab654652..f85669947 100644
--- a/src/sip/jreen/jabber.cpp
+++ b/src/sip/jreen/jabber.cpp
@@ -77,6 +77,10 @@ JabberPlugin::JabberPlugin( const QString& pluginId )
     m_ui->jabberPassword->setText( readPassword() );
     m_ui->jabberServer->setText( readServer() );
     m_ui->jabberPort->setValue( readPort() );
+    m_currentUsername = accountName();
+    m_currentServer = readServer();
+    m_currentPassword = readPassword();
+    m_currentPort = readPort();
 
     // setup JID object
     Jreen::JID jid = Jreen::JID( accountName() );
@@ -915,7 +919,7 @@ JabberPlugin::saveConfig()
 {
     TomahawkSettings::instance()->setValue( pluginId() + "/autoconnect", m_ui->checkBoxAutoConnect->isChecked() );
     TomahawkSettings::instance()->setValue( pluginId() + "/username", m_ui->jabberUsername->text() );
-    TomahawkSettings::instance()->setValue( pluginId() + "/pasword", m_ui->jabberPassword->text() );
+    TomahawkSettings::instance()->setValue( pluginId() + "/password", m_ui->jabberPassword->text() );
     TomahawkSettings::instance()->setValue( pluginId() + "/port", m_ui->jabberPort->value() );
     TomahawkSettings::instance()->setValue( pluginId() + "/server", m_ui->jabberServer->text() );