[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=3342efc

The following commit has been merged in the master branch:
commit 3342efc3d6c59587a992122619320c2c49d461ec
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Nov 14 11:17:33 2012 +0900

    Update AddContactDialog to new parameters
    
    REVIEW: 107322
---
 contact-list-widget.cpp | 9 +--------
 contact-list-widget.h   | 1 -
 main-widget.cpp         | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 159ae1d..a75558a 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -149,13 +149,6 @@ void ContactListWidget::setAccountManager(const Tp::AccountManagerPtr &accountMa
     }
 }
 
-ContactsModel* ContactListWidget::accountsModel()
-{
-    Q_D(ContactListWidget);
-
-    return d->model;
-}
-
 void ContactListWidget::showSettingsKCM()
 {
     KSettings::Dialog *dialog = new KSettings::Dialog(this);
@@ -616,7 +609,7 @@ void ContactListWidget::mouseMoveEvent(QMouseEvent *event)
 
     if (index.isValid()) {
         ContactModelItem *contactItem = index.data(ContactsModel::ItemRole).value<ContactModelItem*>();
-        //We put a contact ID and its account ID to the stream, so we can later recreate the contact using AccountsModel
+        //We put a contact ID and its account ID to the stream, so we can later recreate the contact using ContactsModel
         stream << contactItem->contact().data()->id() << d->model->accountForContactItem(contactItem).data()->objectPath();
     }
 
diff --git a/contact-list-widget.h b/contact-list-widget.h
index 3ed83b3..5305e0d 100644
--- a/contact-list-widget.h
+++ b/contact-list-widget.h
@@ -42,7 +42,6 @@ public:
     explicit ContactListWidget(QWidget* parent);
     virtual ~ContactListWidget();
 
-    ContactsModel *accountsModel();
     void setAccountManager(const Tp::AccountManagerPtr &accountManager);
 
 public Q_SLOTS:
diff --git a/main-widget.cpp b/main-widget.cpp
index 174eb55..549553a 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -354,7 +354,7 @@ void MainWidget::showMessageToUser(const QString& text, const MainWidget::System
 
 void MainWidget::onAddContactRequest()
 {
-    KTp::AddContactDialog *dialog = new KTp::AddContactDialog(m_contactsListView->accountsModel(), this);
+    KTp::AddContactDialog *dialog = new KTp::AddContactDialog(m_accountManager, this);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->show();
 }

-- 
ktp-contact-list packaging