[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=e5e42d0

The following commit has been merged in the master branch:
commit e5e42d043bdd9b68ec42538c3c25ddd68c15c33f
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Nov 25 02:06:10 2011 +0100

    Handle finalizing subscription
---
 contact-request-handler.cpp | 22 ++++++++++++++++++----
 contact-request-handler.h   |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index ccb3936..4df0afe 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -139,6 +139,10 @@ void ContactRequestHandler::onPresencePublicationRequested(const Tp::Contacts& c
 
         if (contact->subscriptionState() == Tp::Contact::PresenceStateYes) {
             op = manager->authorizePresencePublication(QList< Tp::ContactPtr >() << contact);
+            op->setProperty("__contact", QVariant::fromValue(contact));
+
+            connect(op, SIGNAL(finished(Tp::PendingOperation*)),
+                    this, SLOT(onFinalizeSubscriptionFinished(Tp::PendingOperation*)));
         } else {
             m_pendingContacts.insert(contact->id(), contact);
 
@@ -149,11 +153,21 @@ void ContactRequestHandler::onPresencePublicationRequested(const Tp::Contacts& c
                                                     contact->id()),
                                                QLatin1String("list-add-user"));
         }
+    }
+}
 
-        if (op) {
-//             connect(op, SIGNAL(finished(Tp::PendingOperation*)),
-//                     SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
-        }
+void ContactRequestHandler::onFinalizeSubscriptionFinished(Tp::PendingOperation *op)
+{
+    Tp::ContactPtr contact = op->property("__contact").value< Tp::ContactPtr >();
+
+    if (op->isError()) {
+        // ARGH
+        m_notifierItem.data()->showMessage(i18n("Error adding contact"),
+                                           i18n("%1 has been added successfully to your contact list, "
+                                                "but might be unable to see your presence. Error details: %2",
+                                                contact->alias(), op->errorMessage()), QLatin1String("dialog-error"));
+    } else {
+        // Yeah. All fine, so don't notify
     }
 }
 
diff --git a/contact-request-handler.h b/contact-request-handler.h
index 43363ef..d3eb97b 100644
--- a/contact-request-handler.h
+++ b/contact-request-handler.h
@@ -53,6 +53,7 @@ public Q_SLOTS:
     void onContactRequestDenied();
     void onAuthorizePresencePublicationFinished(Tp::PendingOperation*);
     void onRemovePresencePublicationFinished(Tp::PendingOperation*);
+    void onFinalizeSubscriptionFinished(Tp::PendingOperation*);
 
 private:
     KStatusNotifierItem *notifierItem();

-- 
ktp-kded-integration-module packaging