From fa2f71549f6c409932c1621533385738036ca022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Tue, 14 Oct 2003 12:49:24 +0000
Subject: [PATCH] Patch from Frerich to use KGlobalSetting instead of
 hardcoding helvetica. Looks like he's too shy to commit it himself ;).

svn path=/trunk/kdebase/kwin/; revision=258819
---
 lib/kdecoration_p.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/kdecoration_p.cpp b/lib/kdecoration_p.cpp
index 19df15fe5b..7421085cca 100644
--- a/lib/kdecoration_p.cpp
+++ b/lib/kdecoration_p.cpp
@@ -25,6 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include "kdecoration_p.h"
 
 #include <kconfig.h>
+#include <kglobalsettings.h>
 #include <qpalette.h>
 #include <qapplication.h>
 #include <assert.h>
@@ -141,8 +142,8 @@ unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config )
     QFont old_activeFontSmall = activeFontSmall;
     QFont old_inactiveFontSmall = inactiveFontSmall;
 
-    // Keep in sync with kglobalsettings.
-    QFont activeFontGuess("helvetica", 12, QFont::Bold);
+    QFont activeFontGuess = KGlobalSettings::generalFont();
+    activeFontGuess.setBold(true);
     activeFontGuess.setPixelSize(12);
 
     activeFont = config->readFontEntry("activeFont", &activeFontGuess);