[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=6cb51ff

The following commit has been merged in the master branch:
commit 6cb51fff06513c0a7ac7761d0008cfe110721101
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Jun 3 00:53:56 2011 +0300

    Fix contact authorization.
---
 main-widget.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 7c65760..12b2b8e 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -433,9 +433,9 @@ void MainWidget::onContactManagerStateChanged(Tp::ContactListState state)
 void MainWidget::onContactManagerStateChanged(const Tp::ContactManagerPtr &contactManager, Tp::ContactListState state)
 {
     if (state == Tp::ContactListStateSuccess) {
-        QFutureWatcher< Tp::ContactPtr > watcher;
-        connect(&watcher, SIGNAL(finished()), this, SLOT(onAccountsPresenceStatusFiltered()));
-        watcher.setFuture(QtConcurrent::filtered(contactManager->allKnownContacts(),
+        QFutureWatcher< Tp::ContactPtr > *watcher = new QFutureWatcher< Tp::ContactPtr >(this);
+        connect(watcher, SIGNAL(finished()), this, SLOT(onAccountsPresenceStatusFiltered()));
+        watcher->setFuture(QtConcurrent::filtered(contactManager->allKnownContacts(),
                                                 kde_tp_filter_contacts_by_publication_status));
 
         kDebug() << "Watcher is on";
@@ -1122,6 +1122,7 @@ void MainWidget::onAccountsPresenceStatusFiltered()
     if (!contacts.isEmpty()) {
         onPresencePublicationRequested(contacts);
     }
+    watcher->deleteLater();
 }
 
 void MainWidget::onPresencePublicationRequested(const Tp::Contacts& contacts)
@@ -1130,7 +1131,7 @@ void MainWidget::onPresencePublicationRequested(const Tp::Contacts& contacts)
         if (KMessageBox::questionYesNo(this, i18n("The contact %1 added you to their contact list. "
                                                   "Do you want to allow this person to see your presence "
                                                   "and add them to your contact list?", contact->id()),
-                                       i18n("Subscription request")) == KDialog::Yes) {
+                                       i18n("Subscription request")) == KMessageBox::Yes) {
             Tp::ContactManagerPtr manager = contact->manager();
             manager->authorizePresencePublication(QList< Tp::ContactPtr >() << contact);
 

-- 
ktp-contact-list packaging