[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 97776] kde ignores icons folder in XDG_DATA_DIRS
From:       Lubos Lunak <l.lunak () kde ! org>
Date:       2006-11-03 12:51:21
Message-ID: 20061103125121.9659.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=97776         




------- Additional Comments From l.lunak kde org  2006-11-03 13:51 -------
SVN commit 601485 by lunakl:

Add $XDG_DATA_DIRS/pixmaps to the icon lookup paths as well,
even though it's not in the spec. E.g. some GNOME apps put
their icons there :-/
CCBUG: 97776



 M  +2 -0      kiconloader.cpp  
 M  +4 -0      kicontheme.cpp  
 M  +3 -1      kstandarddirs.cpp  


--- branches/KDE/3.5/kdelibs/kdecore/kiconloader.cpp #601484:601485
 @ -246,6 +246,8  @
     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);
 
--- branches/KDE/3.5/kdelibs/kdecore/kicontheme.cpp #601484:601485
 @ -108,6 +108,8  @
     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 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)
     {
--- branches/KDE/3.5/kdelibs/kdecore/kstandarddirs.cpp #601484:601485
 @ -100,7 +100,7  @
 			      "wallpaper", "lib", "pixmap", "templates",
 			      "module", "qtplugins",
 			      "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu",
-			      "xdgdata-icon",
+			      "xdgdata-icon", "xdgdata-pixmap",
 			      "kcfg", "emoticons", 0 };
 
 static int tokenize( QStringList& token, const QString& str,
 @ -1058,6 +1058,8  @
         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"))
[prev in list] [next in list] [prev in thread] [next in thread]