[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=f843202

The following commit has been merged in the master branch:
commit f8432020a97d63b146e0df20f2541a7d865c9830
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Apr 22 14:39:23 2011 +0200

    Always use deleteLater() on QObject except some special cases, and beware: connect() can crash if the sender is null as well.
---
 accounts-model.cpp | 2 +-
 main-widget.cpp    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/accounts-model.cpp b/accounts-model.cpp
index 3bb821e..7ecf5bd 100644
--- a/accounts-model.cpp
+++ b/accounts-model.cpp
@@ -118,7 +118,7 @@ AccountsModel::AccountsModel(const Tp::AccountManagerPtr &am, QObject *parent)
 
 AccountsModel::~AccountsModel()
 {
-    delete mPriv->mTree;
+    mPriv->mTree->deleteLater();
     delete mPriv;
 }
 
diff --git a/main-widget.cpp b/main-widget.cpp
index d5ed3dc..089466e 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -698,10 +698,11 @@ void MainWidget::slotAddContactToGroupTriggered()
     const QStringList currentGroups = contact->groups();
 
     Tp::PendingOperation* operation = contact->addToGroup(action->text().remove('&'));
-    connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
-            SLOT(slotGenericOperationFinished(Tp::PendingOperation*)));
 
     if (operation) {
+        connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
+                SLOT(slotGenericOperationFinished(Tp::PendingOperation*)));
+
         foreach (const QString &group, currentGroups) {
             Tp::PendingOperation* operation = contact->removeFromGroup(group);
             connect(operation, SIGNAL(finished(Tp::PendingOperation*)),

-- 
ktp-contact-list packaging