[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=773f234

The following commit has been merged in the master branch:
commit 773f2344f5fd142c10129ef37bcfba08ef013afb
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Dec 30 11:08:19 2011 +0000

    Only show tooltips on contacts, not on headers
---
 tooltips/tooltipmanager.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tooltips/tooltipmanager.cpp b/tooltips/tooltipmanager.cpp
index 8e49540..069c7d6 100644
--- a/tooltips/tooltipmanager.cpp
+++ b/tooltips/tooltipmanager.cpp
@@ -37,6 +37,10 @@
 #include <KIcon>
 #include <KColorScheme>
 
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/contact-model-item.h>
+
+
 class ToolTipManager::Private
 {
 public:
@@ -146,6 +150,10 @@ void ToolTipManager::showToolTip(const  QModelIndex &menuItem)
         return;
     }
 
+    if (!menuItem.data(AccountsModel::ItemRole).canConvert<ContactModelItem*>()) {
+        return;
+    }
+
     QWidget *tip = KToolTip::createTipWindow(createTipContent(menuItem));
 
     // calculate the x- and y-position of the tooltip

-- 
ktp-contact-list packaging