[debian-edu-commits] debian-edu/upstream/ 18/26: Add a blank icon to use in the cache for desktop files refering to a missing icon file, to make sure such meny entries are also quickly handled by KDE.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository kde-icon-cache.

commit 7713b302135dc2ec46ef6d02bdd382cf4228c170
Author: pere <pere at 2f71faf1-f021-45ab-956e-ee25d755e2f5>
Date:   Fri Apr 6 06:11:03 2012 +0000

    Add a blank icon to use in the cache for desktop files refering to a
    missing icon file, to make sure such meny entries are also quickly
    handled by KDE.
    
    git-svn-id: svn+ssh://svn.slxdrift.no/svnroot/oslo/trunk/src/kde-icon-cache@2476 2f71faf1-f021-45ab-956e-ee25d755e2f5
---
 Makefile              |  3 +++
 debian/changelog      |  8 ++++++++
 update-kde-icon-cache | 10 +++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e5ffb69..0d72b8f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 DESTDIR =
 sbindir = /usr/sbin
+iconsdir = /usr/share/icons
 INSTALL = install -D -m755
+INSTALL_DATA = install -D -m644
 
 all:
 
 install:
 	$(INSTALL) update-kde-icon-cache \
 		$(DESTDIR)$(sbindir)/update-kde-icon-cache
+	$(INSTALL_DATA) blank-square.svg $(DESTDIR)$(iconsdir)/blank-square.svg
 
 clean:
diff --git a/debian/changelog b/debian/changelog
index ad54396..31fabcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kde-icon-cache (0.0.5) lenny; urgency=low
+
+  * Add a blank icon to use in the cache for desktop files refering to a
+    missing icon file, to make sure such meny entries are also quickly
+    handled by KDE.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 06 Apr 2012 07:51:42 +0200
+
 kde-icon-cache (0.0.4) lenny; urgency=low
 
   * Also add .desktop icons for menu entries in /usr/share/applnk.
diff --git a/update-kde-icon-cache b/update-kde-icon-cache
index fb73089..459b965 100755
--- a/update-kde-icon-cache
+++ b/update-kde-icon-cache
@@ -247,7 +247,7 @@ add_to_iconcache() {
 	for d in $icondirs ; do
 	    file="$d/$iconname$prefix"
 #	    echo "Checking $file" 1>&2
-	    if [ -e "$file" ] ; then
+	    if [ -e "$file" ] && [ ! -d "$file" ] ; then
 		case "$file" in
 		    *.xpm)
 			cacheprefix=.png
@@ -276,6 +276,14 @@ add_to_iconcache() {
 	    fi
 	done
     done
+
+    # Add dummy icon for the ones we can't find, to stop KDE from
+    # looking for it hundreds of times when the meny is shown.
+    cachefile="$(basename "$iconname" "$curprefix").svg"
+
+    if [ ! -e "$cachedir/$cachefile" ] ; then
+	ln -s /usr/share/icons/blank-square.svg "$cachedir/$cachefile"
+    fi
 }
 
 populate_cache() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/kde-icon-cache.git