[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=56e5d6c

The following commit has been merged in the master branch:
commit 56e5d6cdaec64be9be8afeeefc828926640cbd7e
Merge: 5b626e8b278b4d698bc95883920e7a4438fd7c60 979ce27e1042f35a6552929d2da93b0b11a912c8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Feb 16 00:21:03 2013 +0000

    Merge branch 'kde-telepathy-0.5'

 app/invite-contact-dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc app/invite-contact-dialog.cpp
index 41b27da,99c7a5e..1bdfb07
--- a/app/invite-contact-dialog.cpp
+++ b/app/invite-contact-dialog.cpp
@@@ -29,18 -29,17 +29,18 @@@
  
  #include <TelepathyQt/Contact>
  #include <TelepathyQt/TextChannel>
+ #include <TelepathyQt/PendingChannelRequest>
  
  #include <KTp/debug.h>
 -#include <KTp/Models/accounts-model.h>
 -#include <KTp/Models/accounts-filter-model.h>
 +#include <KTp/Models/contacts-list-model.h>
 +#include <KTp/Models/contacts-filter-model.h>
  #include <KTp/Widgets/contact-grid-widget.h>
- #include <telepathy-qt4/TelepathyQt/PendingChannelRequest>
  
 -InviteContactDialog::InviteContactDialog(const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel, QWidget *parent) :
 +InviteContactDialog::InviteContactDialog(const Tp::AccountManagerPtr &accountManager, const Tp::AccountPtr &account, const Tp::TextChannelPtr &channel, QWidget *parent) :
      KDialog(parent),
      m_account(account),
 -    m_channel(channel)
 +    m_channel(channel),
 +    m_contactsModel(new KTp::ContactsListModel(this))
  {
      resize(500,450);
  

-- 
ktp-text-ui packaging