rpms/kdebase-workspace/F-9 kdebase-workspace-4.0.4-gtkrc.patch, NONE, 1.1 kdebase-workspace.spec, 1.78, 1.79

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4875

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.4-gtkrc.patch 
Log Message:
* Thu May 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-2
- gtkrc patch (rh#443309, kde#146779)


kdebase-workspace-4.0.4-gtkrc.patch:

--- NEW FILE kdebase-workspace-4.0.4-gtkrc.patch ---
diff -up kdebase-workspace-4.0.4/kcontrol/krdb/krdb.cpp.gtkrc kdebase-workspace-4.0.4/kcontrol/krdb/krdb.cpp
--- kdebase-workspace-4.0.4/kcontrol/krdb/krdb.cpp.gtkrc	2008-05-08 09:09:10.000000000 -0500
+++ kdebase-workspace-4.0.4/kcontrol/krdb/krdb.cpp	2008-05-08 09:12:31.000000000 -0500
@@ -87,11 +87,12 @@ static void applyGtkStyles(bool active, 
    QString gtkkde = KStandardDirs::locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
    QByteArray gtkrc = getenv(gtkEnvVar(version));
    QStringList list = QFile::decodeName(gtkrc).split( ':');
-   if (list.count() == 0)
-   {
-      list.append(QLatin1String(sysGtkrc(version)));
-      list.append(QDir::homePath()+userGtkrc(version));
-   }
+   QString userHomeGtkrc = QDir::homePath()+userGtkrc(version);
+   if (!list.contains(userHomeGtkrc))
+      list.prepend(userHomeGtkrc);
+   QLatin1String systemGtkrc = QLatin1String(sysGtkrc(version));
+   if (!list.contains(systemGtkrc))
+      list.prepend(systemGtkrc);
    list.removeAll(gtkkde);
    list.append(gtkkde);
    if (!active)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdebase-workspace.spec	6 May 2008 19:08:42 -0000	1.78
+++ kdebase-workspace.spec	8 May 2008 14:59:01 -0000	1.79
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.4
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -23,6 +23,8 @@
 Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch
 #Â 441062: packagekit tools do not show icons correctly on KDE
 Patch8: kdebase-workspace-4.0.3-krdb.patch
+# http://bugzilla.redhat.com/443309 , http://bugs.kde.org/146779
+Patch9: kdebase-workspace-4.0.4-gtkrc.patch
 
 # upstream patches:
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
@@ -145,6 +147,7 @@
 %patch6 -p0 -b .rootprivs
 %patch7 -p0 -b .timedate-kcm
 %patch8 -p0 -b .krdb
+%patch9 -p1 -b .gtkrc
 
 # upstream patches
 %patch101 -p1 -b .menu-switch
@@ -273,7 +276,10 @@
 
 
 %changelog
-* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.4-1
+* Thu May 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-2
+- gtkrc patch (rh#443309, kde#146779)
+
+* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.4-1
 - kde-4.0.4
 
 * Fri May 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-20