[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=36d504a

The following commit has been merged in the master branch:
commit 36d504a61e9619b75c3773714bb23b5531214989
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Feb 28 20:47:07 2011 +0100

    Rename the executable to telepathy-kde-contactlist. Also filter out contacts with Unknown-type presence together with offline contacts.
---
 CMakeLists.txt         | 10 ++++------
 accountfiltermodel.cpp |  7 ++++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f0809a..b948a24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (telepathy-contactlist-prototype)
+project (telepathy-kde-contactlist)
 
 set (CMAKE_MODULE_PATH
      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
@@ -62,19 +62,17 @@ kde4_add_ui_files (contactlist_SRCS
                    main-widget.ui
 )
 
-kde4_add_executable (telepathy_contactlist_prototype
+kde4_add_executable (telepathy-kde-contactlist
                      ${contactlist_SRCS}
 
 )
 
-target_link_libraries (telepathy_contactlist_prototype
-#                        ${KTELEPATHY_LIBRARIES}
+target_link_libraries (telepathy-kde-contactlist
                        ${TELEPATHY_QT4_LIBRARIES}
                        ${KDE4_KDEUI_LIBS}
-#                        ontologies
 )
 
 # Install:
-install (TARGETS telepathy_contactlist_prototype
+install (TARGETS telepathy-kde-contactlist
          DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/accountfiltermodel.cpp b/accountfiltermodel.cpp
index 5eb2b0f..bcd702f 100644
--- a/accountfiltermodel.cpp
+++ b/accountfiltermodel.cpp
@@ -38,14 +38,15 @@ bool AccountFilterModel::filterOfflineUsers() const
     return m_filterOfflineUsers;
 }
 
-
 bool AccountFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
     //if we're looking at filtering an account or not
     if (source_parent != QModelIndex()) {
         if (m_filterOfflineUsers &&
-            source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt()
-                == Tp::ConnectionPresenceTypeOffline) {
+            (source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt()
+                == Tp::ConnectionPresenceTypeOffline) ||
+            (source_parent.child(source_row, 0).data(AccountsModel::PresenceTypeRole).toUInt()
+                == Tp::ConnectionPresenceTypeUnknown)) {
             return false;
         }
     }

-- 
ktp-contact-list packaging