summaryrefslogtreecommitdiffstats
path: root/opensuse/tdelibs/integrate-global-pixmaps-new.diff
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-13 12:21:22 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-08-13 12:21:22 -0500
commitf65bcb8326e06816d7dc49e58bda120182dbbcd6 (patch)
tree4e7fef001fc523929450778d10c86b41e6e32eda /opensuse/tdelibs/integrate-global-pixmaps-new.diff
parent131df957b41b4683571b1e36e6fed9d614d32356 (diff)
parentfa41f32b69994ecd75b7359fa2df08ea5a3480ab (diff)
downloadtde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.tar.gz
tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/tdelibs/integrate-global-pixmaps-new.diff')
-rw-r--r--opensuse/tdelibs/integrate-global-pixmaps-new.diff13
1 files changed, 13 insertions, 0 deletions
diff --git a/opensuse/tdelibs/integrate-global-pixmaps-new.diff b/opensuse/tdelibs/integrate-global-pixmaps-new.diff
new file mode 100644
index 000000000..2d3a831b7
--- /dev/null
+++ b/opensuse/tdelibs/integrate-global-pixmaps-new.diff
@@ -0,0 +1,13 @@
+Index: kdecore/kicontheme.cpp
+===================================================================
+--- kdecore/kicontheme.cpp.orig
++++ kdecore/kicontheme.cpp
+@@ -150,6 +150,8 @@ KIconTheme::KIconTheme(const QString& na
+ if ( name != "crystalsvg" )
+ for ( QStringList::Iterator it = mInherits.begin(); it != mInherits.end(); ++it )
+ if ( *it == "default" || *it == "hicolor" ) *it="crystalsvg";
++ if ( name == "hicolor" )
++ mInherits = "crystalsuse";
+
+ d->hidden = cfg.readBoolEntry("Hidden", false);
+ d->example = cfg.readPathEntry("Example");