From e7e3172b5286deedc744946862baa655b3e03d35 Mon Sep 17 00:00:00 2001
From: Dave Chapman <dave@dchapman.com>
Date: Sat, 23 Feb 2008 10:48:30 +0000
Subject: "viewers iconset:" must not be empty, so revert that change to
 wpsbuild.pl and make iCatcher specify /.rockbox/icons/viewers.bmp.  Thanks to
 Jens for pointing this out.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16386 a1c6a512-1295-4272-9138-f99709370657
---
 wps/WPSLIST     | 2 +-
 wps/wpsbuild.pl | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/wps/WPSLIST b/wps/WPSLIST
index e290287017..79649f4579 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -157,7 +157,7 @@ Background Color: FFFFFF
 Statusbar: on
 backdrop:
 iconset:
-viewers iconset:
+viewers iconset: /.rockbox/icons/viewers.bmp
 </wps>
 
 <rwps>
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index cb9ccbfc80..a07909ca77 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -144,10 +144,8 @@ sub copythemeviewericon
 {
     #copy the viewer icon specified by the theme
 
-    if ($viewericon ne '') {
-        $viewericon =~ /\/(.*icons\/(.*))/i;
-        `cp $ROOT/icons/$2 $1`;
-    }
+    $viewericon =~ /\/(.*icons\/(.*))/i;
+    `cp $ROOT/icons/$2 $1`;
 }
 
 sub copywps
@@ -246,7 +244,7 @@ MOO
     if(defined($iconset)) {
         push @out, "iconset: $iconset\n";
     }
-    if(defined($viewericon)) {
+    if($viewericon) {
         push @out, "viewers iconset: $viewericon\n";
     }
     if($lineselecttextcolor && $main_depth > 2 ) {
-- 
cgit v1.2.3