[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=c8b2409

The following commit has been merged in the master branch:
commit c8b2409d5ad1c1caeb696ed831f60cecd10f301d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon May 14 17:36:04 2012 +0100

    Fix bug in which passwords would only be used if save password was checked
    
    Reviewed-by: Martin Klapetek
---
 x-telepathy-password-auth-operation.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-telepathy-password-auth-operation.cpp b/x-telepathy-password-auth-operation.cpp
index 8696dc2..0564afa 100644
--- a/x-telepathy-password-auth-operation.cpp
+++ b/x-telepathy-password-auth-operation.cpp
@@ -114,13 +114,13 @@ void XTelepathyPasswordAuthOperation::onDialogFinished(int result)
         return;
     case QDialog::Accepted:
         // save password in kwallet if necessary...
-        if (m_dialog.data()->savePassword()) {
-            kDebug() << "Saving password in wallet";
-            wallet.setPassword(m_account, m_dialog.data()->password());
-            m_saslIface->StartMechanismWithData(QLatin1String("X-TELEPATHY-PASSWORD"), m_dialog.data()->password().toUtf8());
-            if (!m_dialog.isNull()) {
-                m_dialog.data()->deleteLater();
+        if (!m_dialog.isNull()) {
+            if (m_dialog.data()->savePassword()) {
+                kDebug() << "Saving password in wallet";
+                wallet.setPassword(m_account, m_dialog.data()->password());
             }
+            m_saslIface->StartMechanismWithData(QLatin1String("X-TELEPATHY-PASSWORD"), m_dialog.data()->password().toUtf8());
+            m_dialog.data()->deleteLater();
         }
     }
 }

-- 
ktp-auth-handler packaging