rpms/kdebase-runtime/F-8 kdebase-runtime-4.1.1-iconthemes-inherit.patch, NONE, 1.1

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23423/F-8

Added Files:
	kdebase-runtime-4.1.1-iconthemes-inherit.patch 
Log Message:
Sync from devel:

* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-4
- fix broken audio-backend-jack.svgz

* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-3
- add missing icons

* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem
- grow -libs, kde4 styles are unavailable for i386 applications (#456826)

* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
- 4.1.2

* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-3
- fix inherit issue in iconthemes, preview icons
  do not show

kdebase-runtime-4.1.1-iconthemes-inherit.patch:

--- NEW FILE kdebase-runtime-4.1.1-iconthemes-inherit.patch ---
diff -up kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp
--- kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig	2008-09-16 13:24:43.000000000 +0200
+++ kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp	2008-09-16 15:30:14.000000000 +0200
@@ -415,15 +415,16 @@ void loadPreview(QLabel *label, KIconThe
 {
     const int size = qMin(48, icontheme.defaultSize(KIconLoader::Desktop));
     KSvgRenderer renderer;
-    foreach(const QString &name, iconnames) {
-        K3Icon icon = icontheme.iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
+    foreach(const QString &iconthemename, QStringList() << icontheme.internalName() << icontheme.inherits()) {
+      foreach(const QString &name, iconnames) {
+        K3Icon icon = KIconTheme(iconthemename).iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
         if (icon.isValid()) {
             label->setPixmap(QPixmap(icon.path).scaled(size, size));
             return;
         }
-        icon = icontheme.iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
+        icon = KIconTheme(iconthemename).iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
         if( ! icon.isValid() ) {
-            icon = icontheme.iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
+            icon = KIconTheme(iconthemename).iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
             if( ! icon.isValid() ) {
                 continue;
             }
@@ -437,6 +438,7 @@ void loadPreview(QLabel *label, KIconThe
             label->setPixmap(pix.scaled(size, size));
             return;
         }
+      }
     }
     label->setPixmap(QPixmap());
 }