From 33f7b63d11a770162cd7932846a0232554414cec Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Fri, 8 Apr 2005 11:51:06 +0000
Subject: [PATCH] - Fixed switch panel default value in defaults.c - Fixed
 WPrefs path in the installed WMState (changed after recent WPrefs  
 installation path changes) - Fixed wmaker.inst (apparently some very noisy
 individual was unable to get   right his 10 line patch to rename a path)

---
 WindowMaker/Defaults/Makefile.am |  4 +++-
 src/defaults.c                   |  4 ++--
 util/wmaker.inst.in              | 17 ++++++++---------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am
index 5692f30e..e5e057fc 100644
--- a/WindowMaker/Defaults/Makefile.am
+++ b/WindowMaker/Defaults/Makefile.am
@@ -3,6 +3,8 @@ defsdatadir = $(sysconfdir)/WindowMaker
 
 defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
 
+wpexecbindir = @wprefs_bindir@
+
 EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in
 
 CLEANFILES = WMWindowAttributes WindowMaker WMState
@@ -21,7 +23,7 @@ WindowMaker: $(srcdir)/WindowMaker.in
 
 WMState: $(srcdir)/WMState.in
 	-rm -f WMState
-	sed -e "s:#wprefs#:$(wprefsdir)/WPrefs:" $(srcdir)/WMState.in > WMState
+	sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState
 	chmod 644 WMState
 
 WMRootMenu: $(srcdir)/../plmenu
diff --git a/src/defaults.c b/src/defaults.c
index a879b097..0ceecacd 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -659,8 +659,8 @@ WDefaultEntry optionList[] = {
     {"IconTitleBack",	"black",       		NULL,
     NULL,				getColor,	setIconTitleBack
     },
-    {"SwitchPanelImages", "(\"swtile.png\")",    &wPreferences,
-    NULL,                               getPropList,     setSwPOptions
+    {"SwitchPanelImages", "(swtile.png, swback.png, 30, 40)",  &wPreferences,
+    NULL,               getPropList,     setSwPOptions
     },
     /* keybindings */
 #ifndef LITE
diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in
index 2c2c0fdc..ae4cceb7 100644
--- a/util/wmaker.inst.in
+++ b/util/wmaker.inst.in
@@ -135,14 +135,6 @@ else
 fi
 
 
-if [ ! -d "$GSDIR/Library/WindowMaker/CachedPixmaps" ]; then
-	make_dir $GSDIR/WindowMaker/CachedPixmaps
-fi
-
-if [ ! -d "$GSDIR/Library/WindowMaker/WPrefs" ]; then
-	make_dir $GSDIR/WindowMaker/WPrefs
-fi
-
 if [ ! -d "$GSDIR/Defaults" ]; then
 	make_dir $GSDIR/Defaults
 fi
@@ -201,7 +193,6 @@ if [ ! -d "$GSDIR/Library/WindowMaker/Themes" ]; then
 fi
 
 
-
 if [ ! -d "$GSDIR/Library/WindowMaker/Backgrounds" ]; then
 	echo "Creating bg image library $GSDIR/Library/WindowMaker/Backgrounds"
 	make_dir  $GSDIR/Library/WindowMaker/Backgrounds
@@ -242,6 +233,14 @@ else
 fi
 
 
+if [ ! -d "$GSDIR/Library/WindowMaker/CachedPixmaps" ]; then
+	make_dir $GSDIR/Library/WindowMaker/CachedPixmaps
+fi
+
+if [ ! -d "$GSDIR/Library/WindowMaker/WPrefs" ]; then
+	make_dir $GSDIR/Library/WindowMaker/WPrefs
+fi
+
 if test -z "#LITE#" ; then
 FILES=`(cd $GLOBALDIR; ls menu menu.* plmenu plmenu.?? wmmacros)`
 for i in $FILES; do