[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=2df9c5b

The following commit has been merged in the master branch:
commit 2df9c5b04b82c34365a257ea748648b20e6e4dec
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Nov 16 19:37:22 2012 +0900

    Match latest library
    
    Reviewed-by: George Kiagiadakis
---
 presence/src/presence-applet.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index ec09ca3..326f1b9 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -33,7 +33,6 @@
 #include <KStandardDirs>
 
 #include <KTp/global-presence.h>
-#include <KTp/Models/contacts-model.h>
 #include <KTp/Widgets/add-contact-dialog.h>
 #include <KTp/Widgets/join-chat-room-dialog.h>
 
@@ -230,11 +229,7 @@ void TelepathyPresenceApplet::startContactList()
 
 void TelepathyPresenceApplet::onAddContactRequest()
 {
-    ContactsModel *contactsModel = new ContactsModel();
-    contactsModel->setAccountManager(m_accountManager);
-
-    KTp::AddContactDialog *dialog = new KTp::AddContactDialog(contactsModel);
-    contactsModel->setParent(dialog); //delete the model with the dialog
+    KTp::AddContactDialog *dialog = new KTp::AddContactDialog(m_accountManager);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->show();
 }

-- 
ktp-contact-applet packaging