[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=e9c77ef

The following commit has been merged in the master branch:
commit e9c77ef05149da9cef21047c96d83e4094fc3d61
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu May 31 10:54:56 2012 +0200

    Fix potentially crashy code
    
    Reviewed-by: George Kiagiadakis
---
 src/edit-display-name-button.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/edit-display-name-button.cpp b/src/edit-display-name-button.cpp
index 4596e90..afb327c 100644
--- a/src/edit-display-name-button.cpp
+++ b/src/edit-display-name-button.cpp
@@ -138,12 +138,15 @@ Tp::AccountPtr EditDisplayNameButton::account() const
 void EditDisplayNameButton::onClicked()
 {
     if (!m_account.isNull() && m_account->isValid()) {
-        EditDisplayNameDialog *dialog = new EditDisplayNameDialog(m_account, this);
-        dialog->exec();
-        if (dialog->result() == KDialog::Accepted && dialog->displayName() != m_account->displayName()) {
-            kDebug() << "Setting display name" << dialog->displayName() << "for account" << account()->uniqueIdentifier();
-            Tp::PendingOperation *op = m_account->setDisplayName(dialog->displayName());
-            connect(op, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onFinished(Tp::PendingOperation*)));
+        QWeakPointer<EditDisplayNameDialog> dialog = new EditDisplayNameDialog(m_account, this);
+        dialog.data()->exec();
+        if (!dialog.isNull()) {
+            if (dialog.data()->result() == KDialog::Accepted && dialog.data()->displayName() != m_account->displayName()) {
+                kDebug() << "Setting display name" << dialog.data()->displayName() << "for account" << account()->uniqueIdentifier();
+                Tp::PendingOperation *op = m_account->setDisplayName(dialog.data()->displayName());
+                connect(op, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onFinished(Tp::PendingOperation*)));
+            }
+            dialog.data()->deleteLater();
         }
     }
 }

-- 
ktp-accounts-kcm packaging