[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=fa8b8c9

The following commit has been merged in the master branch:
commit fa8b8c944697c6b151bb002a57afec32b39f2f7e
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Nov 12 18:50:31 2012 +0100

    Port to the new ContactsModel
    
    Thanks-To: Alin M. Elena
---
 presence/src/presence-applet.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

-- 
ktp-contact-applet packaging