From df4141236b52bbc4d3767f5b493980153886d02c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= <kix@kix.es>
Date: Wed, 31 Oct 2012 22:44:21 +0100
Subject: [PATCH] CachedPixmaps added as pixmap folder

The CachedPixmap folder is added to the icon list. This is because
if one icon is created, but the user change it and set other icon, the first
icon cannot be selected anymore using the settings window. The user
needs modify the configuration files by hand.

Some extra paths are added to the debian default config file.
---
 WindowMaker/Defaults/WindowMaker.in |  2 ++
 debian/debianfiles/conf/WindowMaker | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in
index 6b2890d6..3e576bea 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -14,6 +14,7 @@
     "#pkgdatadir#/Pixmaps",
     "/usr/include/X11/pixmaps",
     "~/GNUstep/Library/WindowMaker/Pixmaps",
+    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
     "/usr/share/icons",
     "/usr/local/share/pixmaps",
     "/usr/share/pixmaps"
@@ -21,6 +22,7 @@
   PixmapPath = (
     "~/GNUstep/Library/WindowMaker/Pixmaps",
     "~/GNUstep/Library/WindowMaker/Backgrounds",
+    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
     "#pkgdatadir#/Pixmaps",
     "#pkgdatadir#/Backgrounds",
     "/usr/include/X11/pixmaps",
diff --git a/debian/debianfiles/conf/WindowMaker b/debian/debianfiles/conf/WindowMaker
index 3d0bb759..cc36e7cc 100644
--- a/debian/debianfiles/conf/WindowMaker
+++ b/debian/debianfiles/conf/WindowMaker
@@ -11,20 +11,25 @@
   IconificationStyle = Zoom;
   IconPath = (
     "~/GNUstep/Library/Icons",
-    "/usr/local/share/WindowMaker/Icons",
+    "~/GNUstep/Library/WindowMaker/Pixmaps",
+    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
     "/usr/share/WindowMaker/Icons",
-    "/usr/local/share/icons",
-    "/usr/share/icons"
+    "/usr/share/WindowMaker/Pixmaps",
+    "/usr/share/icons",
+    "/usr/local/share/WindowMaker/Icons",
+    "/usr/local/share/WindowMaker/Pixmaps",
+    "/usr/local/share/icons"
   );
   PixmapPath = (
     "~/GNUstep/Library/WindowMaker/Pixmaps",
     "~/GNUstep/Library/WindowMaker/Backgrounds",
-    "/usr/local/share/WindowMaker/Pixmaps",
-    "/usr/local/share/WindowMaker/Backgrounds",
+    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
     "/usr/share/WindowMaker/Backgrounds",
     "/usr/share/WindowMaker/Pixmaps",
-    "/usr/local/share/pixmaps",
-    "/usr/share/pixmaps"
+    "/usr/share/pixmaps",
+    "/usr/local/share/WindowMaker/Pixmaps",
+    "/usr/local/share/WindowMaker/Backgrounds",
+    "/usr/local/share/pixmaps"
   );
   WindowTitleBalloons = YES;
   IconSize = 64;
-- 
2.11.4.GIT