gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

- Fixed switch panel default value in defaults.c

Browse Source 
- 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)
This commit is contained in:
dan
2005-04-08 11:51:06 +00:00
parent 880880162b
commit 33f7b63d11
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WindowMaker/Defaults/Makefile.am
View File

@@ -3,6 +3,8 @@ defsdatadir = $(sysconfdir)/WindowMaker
defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
wpexecbindir = @wprefs_bindir@
EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in
CLEANFILES = WMWindowAttributes WindowMaker WMState CLEANFILES = WMWindowAttributes WindowMaker WMState
@@ -21,7 +23,7 @@ WindowMaker: $(srcdir)/WindowMaker.in
WMState: $(srcdir)/WMState.in WMState: $(srcdir)/WMState.in
-rm -f WMState -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 chmod 644 WMState
WMRootMenu: $(srcdir)/../plmenu WMRootMenu: $(srcdir)/../plmenu

2
src/defaults.c
View File

@@ -659,7 +659,7 @@ WDefaultEntry optionList[] = {
{"IconTitleBack", "black", NULL, {"IconTitleBack", "black", NULL,
NULL, getColor, setIconTitleBack NULL, getColor, setIconTitleBack
}, },
{"SwitchPanelImages", "(\"swtile.png\")", &wPreferences, {"SwitchPanelImages", "(swtile.png, swback.png, 30, 40)", &wPreferences,
NULL, getPropList, setSwPOptions NULL, getPropList, setSwPOptions
}, },
/* keybindings */ /* keybindings */

17
util/wmaker.inst.in
View File

@@ -135,14 +135,6 @@ else
fi 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 if [ ! -d "$GSDIR/Defaults" ]; then
make_dir $GSDIR/Defaults make_dir $GSDIR/Defaults
fi fi
@@ -201,7 +193,6 @@ if [ ! -d "$GSDIR/Library/WindowMaker/Themes" ]; then
fi fi
if [ ! -d "$GSDIR/Library/WindowMaker/Backgrounds" ]; then if [ ! -d "$GSDIR/Library/WindowMaker/Backgrounds" ]; then
echo "Creating bg image library $GSDIR/Library/WindowMaker/Backgrounds" echo "Creating bg image library $GSDIR/Library/WindowMaker/Backgrounds"
make_dir $GSDIR/Library/WindowMaker/Backgrounds make_dir $GSDIR/Library/WindowMaker/Backgrounds
@@ -242,6 +233,14 @@ else
fi 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 if test -z "#LITE#" ; then
FILES=`(cd $GLOBALDIR; ls menu menu.* plmenu plmenu.?? wmmacros)` FILES=`(cd $GLOBALDIR; ls menu menu.* plmenu plmenu.?? wmmacros)`
for i in $FILES; do for i in $FILES; do