kdm: prepare for Katie changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kdm/config.def b/kdm/config.def
index ee1d8f2..49f4cad 100644 (file)
--- a/kdm/config.def
+++ b/kdm/config.def
@@ -2140,30 +2140,30 @@ Description:
 
 Key: GreetFont
 Type: string
-Default: "Serif,20,-1,5,50,0,0,0,0"
+Default: "Serif,20,-1,50,0,0,0,0"
 CDefault: "Serif 20pt bold"
 User: greeter:font
-Instance: #*/"Serif,20,-1,5,50,0,0,0,0"
+Instance: #*/"Serif,20,-1,50,0,0,0,0"
 Comment: &
 Description:
  The font for the greeter headline. The value is encoded.
 
 Key: StdFont
 Type: string
-Default: "Sans Serif,10,-1,5,50,0,0,0,0"
+Default: "Sans Serif,10,-1,50,0,0,0,0"
 CDefault: "Sans Serif 10pt"
 User: greeter(normalFont):font
-Instance: #*/"Sans Serif,10,-1,5,50,0,0,0,0"
+Instance: #*/"Sans Serif,10,-1,50,0,0,0,0"
 Comment: &
 Description:
  The normal font used in the greeter. The value is encoded.
 
 Key: FailFont
 Type: string
-Default: "Sans Serif,10,-1,5,75,0,0,0,0"
+Default: "Sans Serif,10,-1,75,0,0,0,0"
 CDefault: "Sans Serif 10pt bold"
 User: greeter:font
-Instance: #*/"Sans Serif,10,-1,5,75,0,0,0,0"
+Instance: #*/"Sans Serif,10,-1,75,0,0,0,0"
 Comment: &
 Description:
  The font used for the <quote>Login Failed</quote> message. The value is encoded.

diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp
index 448194d..010c852 100644 (file)
--- a/kdm/kfrontend/kdmconfig.cpp
+++ b/kdm/kfrontend/kdmconfig.cpp
@@ -75,8 +75,7 @@ str2Font(const QString &aValue)
         aRetFont->fromString(aValue);
     }
     aRetFont->setStyleStrategy((QFont::StyleStrategy)
-       (QFont::PreferMatch |
-        (_antiAliasing ? QFont::PreferAntialias : QFont::NoAntialias)));
+       (_antiAliasing ? QFont::PreferAntialias : QFont::NoAntialias));
 
     return aRetFont;
 }