[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=34c77bf

The following commit has been merged in the master branch:
commit 34c77bf2f32fcb506b2c4e4597d74f10b66bed63
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Wed Jul 11 17:16:08 2012 +0300

    Update to the new AddContactDialog API
---
 presence/src/presence-applet.cpp | 43 ++++++----------------------------------
 presence/src/presence-applet.h   |  1 -
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index 2e0a7de..98a4749 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -189,44 +189,13 @@ void TelepathyPresenceApplet::startContactList()
 
 void TelepathyPresenceApplet::onAddContactRequest()
 {
-    QWeakPointer<AccountsModel> accountModel = new AccountsModel();
-    accountModel.data()->setAccountManager(m_accountManager);
-
-    QWeakPointer<KTp::AddContactDialog> dialog = new KTp::AddContactDialog(accountModel.data(), 0);
-    if (dialog.data()->exec() == QDialog::Accepted)
-    {
-        Tp::AccountPtr account = dialog.data()->account();
-        if (account.isNull()) {
-            KMessageBox::error(dialog.data(),
-                               i18n("Seems like you forgot to select an account. Also do not forget to connect it first."),
-                               i18n("No Account Selected"));
-        } else if (account->connection().isNull()) {
-            KMessageBox::error(dialog.data(),
-                               i18n("An error we did not anticipate just happened and so the contact could not be added. Sorry."),
-                               i18n("Account Error"));
-        } else {
-            QStringList identifiers = QStringList() << dialog.data()->screenName();
-            Tp::PendingContacts *pendingContacts = account->connection()->contactManager()->contactsForIdentifiers(identifiers);
-            connect(pendingContacts, SIGNAL(finished(Tp::PendingOperation*)),
-                    this, SLOT(onAddContactRequestFoundContacts(Tp::PendingOperation*)));
-        }
-    }
-
-    delete dialog.data();
-    delete accountModel.data();
-}
+    AccountsModel *accountsModel = new AccountsModel();
+    accountsModel->setAccountManager(m_accountManager);
 
-void TelepathyPresenceApplet::onAddContactRequestFoundContacts(Tp::PendingOperation *operation)
-{
-    Tp::PendingContacts *pendingContacts = qobject_cast<Tp::PendingContacts*>(operation);
-
-    if (!pendingContacts->isError()) {
-        //request subscription
-        pendingContacts->manager()->requestPresenceSubscription(pendingContacts->contacts());
-    } else {
-        kDebug() << pendingContacts->errorName();
-        kDebug() << pendingContacts->errorMessage();
-    }
+    KTp::AddContactDialog *dialog = new KTp::AddContactDialog(accountsModel);
+    accountsModel->setParent(dialog); //delete the model with the dialog
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
 }
 
 void TelepathyPresenceApplet::onPresenceChanged(KTp::Presence presence)
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
index 0bf936f..58befb0 100644
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@ -65,7 +65,6 @@ private Q_SLOTS:
     void startAccountManager();
     void startContactList();
     void onAddContactRequest();
-    void onAddContactRequestFoundContacts(Tp::PendingOperation *operation);
 
 private:
     /** used only upon creation to setup a list of actions for the context menu */

-- 
ktp-contact-applet packaging