[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-08-24 13:38:08
Message-ID: 20060824133808.31002.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         
l.lunak kde org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From l.lunak kde org  2006-08-24 15:38 -------
SVN commit 576641 by lunakl:

Read icons also from $XDG_DATA_DIRS, modified patch from #97776.
FEATURE: 97776



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


--- branches/KDE/3.5/kdelibs/kdecore/kiconloader.cpp #576640:576641
 @ -260,6 +260,8  @
     QStringList dirs;
     dirs += d->mpDirs->resourceDirs("icon");
     dirs += d->mpDirs->resourceDirs("pixmap");
+    dirs += d->mpDirs->resourceDirs("xdgdata-icon");
+    dirs += "/usr/share/pixmaps";
     for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it)
 	d->mpDirs->addResourceDir("appicon", *it);
 
--- branches/KDE/3.5/kdelibs/kdecore/kicontheme.cpp #576640:576641
 @ -105,7 +105,7  @
     }
     // Find the theme description file. These are always global.
 
-    icnlibs = KGlobal::dirs()->resourceDirs("icon");
+    icnlibs = KGlobal::dirs()->resourceDirs("icon") + \
KGlobal::dirs()->resourceDirs("xdgdata-icon");  for (it=icnlibs.begin(); \
it!=icnlibs.end(); ++it)  {
         cDir = *it + name + "/";
 @ -466,7 +466,7  @
         return *_theme_list;
 
     _theme_list = new QStringList();
-    QStringList icnlibs = KGlobal::dirs()->resourceDirs("icon");
+    QStringList icnlibs = KGlobal::dirs()->resourceDirs("icon") + \
KGlobal::dirs()->resourceDirs("xdgdata-icon");  QStringList::ConstIterator it;
     for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
     {
--- branches/KDE/3.5/kdelibs/kdecore/kstandarddirs.cpp #576640:576641
 @ -100,6 +100,7  @
 			      "wallpaper", "lib", "pixmap", "templates",
 			      "module", "qtplugins",
 			      "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu",
+			      "xdgdata-icon",
 			      "kcfg", "emoticons", 0 };
 
 static int tokenize( QStringList& token, const QString& str,
 @ -1055,6 +1056,8  @
         return "lib" KDELIBSUFF "/kde3/plugins";
     if (!strcmp(type, "xdgdata-apps"))
         return "applications/";
+    if (!strcmp(type, "xdgdata-icon"))
+        return "icons/";
     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]