[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=2cd80ef

The following commit has been merged in the master branch:
commit 2cd80ef70dfb261481902fb8484278069e46976b
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Aug 3 09:19:17 2012 +0200

    Add method to return the AccountsFilterModel
---
 KTp/Widgets/contact-grid-dialog.cpp | 8 +++++++-
 KTp/Widgets/contact-grid-dialog.h   | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/KTp/Widgets/contact-grid-dialog.cpp b/KTp/Widgets/contact-grid-dialog.cpp
index d00948c..16f3a1b 100644
--- a/KTp/Widgets/contact-grid-dialog.cpp
+++ b/KTp/Widgets/contact-grid-dialog.cpp
@@ -136,7 +136,7 @@ KTp::ContactGridDialog::ContactGridDialog(QWidget *parent) :
     d->contactGridWidget = new KTp::ContactGridWidget(d->accountsModel, this);
     d->contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
     d->contactGridWidget->filter()->setPresenceTypeFilterFlags(AccountsFilterModel::ShowOnlyConnected);
-//    d->contactGridWidget->filter()->setCapabilityFilterFlags(AccountsFilterModel::FilterBySSHContactCapability);
+
     setMainWidget(d->contactGridWidget);
 
     connect(d->contactGridWidget,
@@ -164,4 +164,10 @@ Tp::ContactPtr KTp::ContactGridDialog::contact()
     return d->contact;
 }
 
+AccountsFilterModel* KTp::ContactGridDialog::filter() const
+{
+    return d->contactGridWidget->filter();
+}
+
+
 #include "contact-grid-dialog.moc"
diff --git a/KTp/Widgets/contact-grid-dialog.h b/KTp/Widgets/contact-grid-dialog.h
index 48d5ab3..56710b9 100644
--- a/KTp/Widgets/contact-grid-dialog.h
+++ b/KTp/Widgets/contact-grid-dialog.h
@@ -36,7 +36,7 @@ class PendingOperation;
 class AccountsModel;
 class QTcpSocket;
 
-
+class AccountsFilterModel;
 namespace KTp {
 class ContactGridWidget;
 
@@ -49,6 +49,8 @@ public:
     ContactGridDialog(QWidget *parent);
     virtual ~ContactGridDialog();
 
+    virtual AccountsFilterModel* filter() const;
+
     virtual Tp::AccountPtr account();
     virtual Tp::ContactPtr contact();
 

-- 
ktp-common-internals packaging