File xdgdata-pixmap.diff of Package kdelibs3

Overview Repositories Revisions Requests Users Attributes Meta

File xdgdata-pixmap.diff of Package kdelibs3 (Revision dcb25f747303eab3c5b90ef2222056a3)

Currently displaying revision dcb25f747303eab3c5b90ef2222056a3 , Show latest

--- kdecore/kiconloader.cpp.sav	2006-10-04 17:37:59.000000000 +0200
+++ kdecore/kiconloader.cpp	2006-11-03 12:33:21.000000000 +0100
@@ -246,6 +246,8 @@ void KIconLoader::init( const QString& _
     dirs += d->mpDirs->resourceDirs("pixmap");
     dirs += d->mpDirs->resourceDirs("xdgdata-icon");
     dirs += "/usr/share/pixmaps";
+    // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+    dirs += d->mpDirs->resourceDirs("xdgdata-pixmap");
     for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it)
 	d->mpDirs->addResourceDir("appicon", *it);
 
--- kdecore/kicontheme.cpp.sav	2006-09-01 13:20:53.000000000 +0200
+++ kdecore/kicontheme.cpp	2006-11-03 12:35:01.000000000 +0100
@@ -108,6 +108,8 @@ KIconTheme::KIconTheme(const QString& na
     icnlibs = KGlobal::dirs()->resourceDirs("icon");
     icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-icon");
     icnlibs += "/usr/share/pixmaps";
+    // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+    icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap");
     for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
     {
         cDir = *it + name + "/";
@@ -471,6 +473,8 @@ QStringList KIconTheme::list()
     QStringList icnlibs = KGlobal::dirs()->resourceDirs("icon");
     icnlibs += (KGlobal::dirs()->resourceDirs("xdgdata-icon"));
     icnlibs += "/usr/share/pixmaps";
+    // These are not in the icon spec, but e.g. GNOME puts some icons there anyway.
+    icnlibs += KGlobal::dirs()->resourceDirs("xdgdata-pixmap");
     QStringList::ConstIterator it;
     for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
     {
--- kdecore/kstandarddirs.cpp.sav	2006-08-24 15:38:00.000000000 +0200
+++ kdecore/kstandarddirs.cpp	2006-11-03 12:36:15.000000000 +0100
@@ -100,7 +100,7 @@ static const char* const types[] = {"htm
 			      "wallpaper", "lib", "pixmap", "templates",
 			      "module", "qtplugins",
 			      "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu",
-			      "xdgdata-icon", "xdgconf-autostart",
+			      "xdgdata-icon", "xdgconf-autostart", "xdgdata-pixmap",
 			      "kcfg", "emoticons", 0 };
 
 static int tokenize( QStringList& token, const QString& str,
@@ -1058,6 +1058,8 @@ QString KStandardDirs::kde_default(const
         return "applications/";
     if (!strcmp(type, "xdgdata-icon"))
         return "icons/";
+    if (!strcmp(type, "xdgdata-pixmap"))
+        return "pixmaps/";
     if (!strcmp(type, "xdgdata-dirs"))
         return "desktop-directories/";
     if (!strcmp(type, "xdgconf-menu"))

Places

File xdgdata-pixmap.diff of Package kdelibs3 (Revision dcb25f747303eab3c5b90ef2222056a3)

Places