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

The following commit has been merged in the master branch:
commit ddc8b8f91a0623ae11910f468b3f7ffc7dc0a27b
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Thu Dec 15 16:05:55 2011 +0100

    fix-krazy: Fix crashy dialogs
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index eadc663..ac2ffae 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -211,18 +211,18 @@ void AccountEditWidget::onAdvancedClicked()
         return;
     }
 
-    KDialog dialog(this);
-    dialog.setWindowTitle(i18n("Advanced Options"));
+    QWeakPointer<KDialog> dialog = new KDialog(this);
+    dialog.data()->setWindowTitle(i18n("Advanced Options"));
 
     AbstractAccountParametersWidget *advancedWidget;
     advancedWidget = d->accountUi->advancedOptionsWidget(d->parameterModel,
-                                                         &dialog);
-    dialog.setMainWidget(advancedWidget);
+                                                         dialog.data());
+    dialog.data()->setMainWidget(advancedWidget);
 
     // loop until the entered values are ok or the user cancels the dialog
 
-    while(true) {
-        if (dialog.exec() == KDialog::Accepted) {
+    while (true) {
+        if (dialog.data()->exec() == KDialog::Accepted) {
             advancedWidget->submit();
             // validate the parameter values
             if (!advancedWidget->validateParameterValues()) {
@@ -231,6 +231,10 @@ void AccountEditWidget::onAdvancedClicked()
         }
         break;
     }
+
+    if (!dialog.isNull()) {
+        dialog.data()->deleteLater();
+    }
 }
 
 ParameterEditModel* AccountEditWidget::parameterModel() const

-- 
ktp-accounts-kcm packaging