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

The following commit has been merged in the master branch:
commit a562a763833df056cc00e201f586cc18f33e41f2
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Aug 3 13:19:39 2009 +0000

    Destroy the edit account dialog when it is closed.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006318
---
 src/account-item.cpp | 17 +++++++++++++++++
 src/account-item.h   |  1 +
 2 files changed, 18 insertions(+)

diff --git a/src/account-item.cpp b/src/account-item.cpp
index eaa237a..69ac82f 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -90,6 +90,12 @@ void AccountItem::edit()
     // FIXME: There should be a driving test for those who want to become parents... :'(
     QWidget *p = qobject_cast<QWidget*>(parent()->parent());
     m_editAccountDialog = new EditAccountDialog(this, p); // FIXME: Argh I'm going to jump off a bridge
+
+    // Connect to the dialog's signals.
+    connect(m_editAccountDialog,
+            SIGNAL(finished()),
+            SLOT(onAccountEdited()));
+
     m_editAccountDialog->show();
 }
 
@@ -164,5 +170,16 @@ void AccountItem::onAccountRemoved(Tp::PendingOperation *op)
     Q_EMIT removed();
 }
 
+void AccountItem::onAccountEdited()
+{
+    kDebug();
+
+    m_editAccountDialog->deleteLater();
+    m_editAccountDialog = 0;
+
+    Q_EMIT updated();
+}
+
+
 #include "account-item.moc"
 
diff --git a/src/account-item.h b/src/account-item.h
index 4c9feec..b197505 100644
--- a/src/account-item.h
+++ b/src/account-item.h
@@ -51,6 +51,7 @@ private Q_SLOTS:
     void generateIcon();
     void onAccountReady(Tp::PendingOperation *op);
     void onAccountRemoved(Tp::PendingOperation *op);
+    void onAccountEdited();
 
 Q_SIGNALS:
     void ready();

-- 
ktp-accounts-kcm packaging