[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=e31f027

The following commit has been merged in the master branch:
commit e31f0274ee49e4fe2d571d65641193d3ebd2a5af
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Mon Dec 19 11:52:41 2011 +0100

    fix-krazy: Avoid crashy dialogs
---
 sasl-auth-op.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index 092ee75..50938de 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -135,19 +135,26 @@ void SaslAuthOp::promptUser(bool isFirstRun)
     if (wallet.hasPassword(m_account) && isFirstRun) {
         password = wallet.password(m_account);
     } else {
-        PasswordPrompt dialog(m_account);
-        if (dialog.exec() == QDialog::Rejected) {
+        QWeakPointer<PasswordPrompt> dialog = new PasswordPrompt(m_account);
+        if (dialog.data()->exec() == QDialog::Rejected) {
             kDebug() << "Authentication cancelled";
             m_saslIface->AbortSASL(Tp::SASLAbortReasonUserAbort, "User cancelled auth");
             m_channel->requestClose();
             setFinished();
+            if (!dialog.isNull()) {
+                dialog.data()->deleteLater();
+            }
             return;
         }
-        password = dialog.password();
+        password = dialog.data()->password();
         // save password in kwallet if necessary...
-        if (dialog.savePassword()) {
+        if (dialog.data()->savePassword()) {
             kDebug() << "Saving password in wallet";
-            wallet.setPassword(m_account, dialog.password());
+            wallet.setPassword(m_account, dialog.data()->password());
+        }
+
+        if (!dialog.isNull()) {
+            dialog.data()->deleteLater();
         }
     }
 

-- 
ktp-auth-handler packaging