[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=0518aa0

The following commit has been merged in the master branch:
commit 0518aa05a2e8f9811cc323757e1f6fcacc759d41
Author: Sven Brauch <svenbrauch at googlemail.com>
Date:   Thu May 2 19:06:19 2013 +0200

    Avoid warning messages when closing the settings dialog
    
    KWidgetItemDelegate doesn't like it if its view is deleted before
    the delegate itself. This happens though if the delegate is
    parented to the dialog itself, since the dialog will delete the UI
    in its destructor (thus deleting the view), but the delegate is only
    deleted by ~QObject's deleteChildren() call (which happens later).
    Parenting the delegates to the dialog's main layout instead
    prevents the problem.
    This might fix crash bug 314400, but it's not clear if it will.
    BUG:314400
---
 src/kcm-telepathy-accounts.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 03caf66..df41682 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -146,10 +146,12 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
     m_salutBusyWheel->setWidget(m_ui->salutWidget);
     m_salutBusyWheel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
 
-    AccountsListDelegate* accountsDelegate = new AccountsListDelegate(m_ui->accountsListView, this);
+    // parent the delegates to the layout, because KWidgetItemDelegate doesn't like it if the view
+    // is deleted before the delegate
+    AccountsListDelegate* accountsDelegate = new AccountsListDelegate(m_ui->accountsListView, layout());
     m_ui->accountsListView->setItemDelegate(accountsDelegate);
 
-    AccountsListDelegate* salutDelegate = new AccountsListDelegate(m_ui->salutListView, this);
+    AccountsListDelegate* salutDelegate = new AccountsListDelegate(m_ui->salutListView, layout());
     m_ui->salutListView->setItemDelegate(salutDelegate);
 
     int height = salutDelegate->sizeHint(QStyleOptionViewItem(), m_salutFilterModel->index(0,0)).height() + 3*2;

-- 
ktp-accounts-kcm packaging