[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=c69b653

The following commit has been merged in the master branch:
commit c69b6536306f360d23b31348ca2869633285be6c
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Fri Oct 7 21:31:33 2011 +0530

    Use KGlobalSettings::generalFont() as the default font for presence's
---
 presence-model.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/presence-model.cpp b/presence-model.cpp
index 064704e..8803079 100644
--- a/presence-model.cpp
+++ b/presence-model.cpp
@@ -8,6 +8,7 @@
 
 #include <KConfig>
 #include <KConfigGroup>
+#include <KGlobalSettings>
 
 
 
@@ -66,7 +67,7 @@ QVariant PresenceModel::data(const QModelIndex &index, int role) const
 
     case Qt::FontRole:
         if (presence.statusMessage().isEmpty()) {
-            QFont font;
+            QFont font = KGlobalSettings::generalFont();
             font.setBold(true);
             return font;
         }

-- 
ktp-contact-list packaging