rpms/kdelibs/devel kdelibs-4.1.82-kde149705.patch,1.1,1.2

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15681/devel

Modified Files:
	kdelibs-4.1.82-kde149705.patch 
Log Message:
Fix kde149705 patch.
Hint: please don't make any "slight modifications" to my patches you're unsure about, they're almost definitely a mistake. ;-)
In this case, we want to use widgetStyle4 only if it is defined, otherwise fall back to widgetStyle, which is the officially documented setting also in the GUI. So just changing widgetStyle to widgetStyle4 is wrong.

kdelibs-4.1.82-kde149705.patch:

Index: kdelibs-4.1.82-kde149705.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.1.82-kde149705.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.82-kde149705.patch	9 Dec 2008 13:24:29 -0000	1.1
+++ kdelibs-4.1.82-kde149705.patch	9 Dec 2008 15:23:31 -0000	1.2
@@ -18,7 +18,7 @@
          const QString &defaultStyle = KStyle::defaultStyle();
          const KConfigGroup pConfig(KGlobal::config(), "General");
 -        const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
-+        const QString &styleStr = pConfig.readEntry("widgetStyle4", defaultStyle);
++        const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
  
          if (styleStr.isEmpty() ||
                  // check whether we already use the correct style to return then