We remove the macros LOCAL_THEMES_DIR, LOCAL_STYLES_DIR,
LOCAL_ICON_SETS_DIR, and LOCAL_BACKGROUNDS_DIR.
They were only referenced in the Debian patch 54_Debian_wmmacros.diff, which
set them to /usr/local/share/WindowMaker/{Themes,Styles,etc.}.
In a default installation, THEMES_DIR, STYLES_DIR, etc. coincide exactly
with these paths. In a Debian installation (which defaults to /usr/share
instead of /usr/local/share), it seems unlikely that a user would have these
files in both locations.
---
WindowMaker/appearance.menu.in | 6 +++---
WindowMaker/background.menu | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/WindowMaker/appearance.menu.in b/WindowMaker/appearance.menu.in
index 4e259834..99759b15 100644
--- a/WindowMaker/appearance.menu.in
+++ b/WindowMaker/appearance.menu.in
@@ -2,9 +2,9 @@
Appearance MENU
"Background" OPEN_MENU background.menu
- "Styles" OPEN_MENU -noext LOCAL_STYLES_DIR STYLES_DIR USER_STYLES_DIR WITH
setstyle
- "Themes" OPEN_MENU -noext LOCAL_THEMES_DIR THEMES_DIR USER_THEMES_DIR WITH
setstyle
- "Icon Sets" OPEN_MENU -noext LOCAL_ICON_SETS_DIR ICON_SETS_DIR
USER_ICON_SETS_DIR WITH seticons
+ "Styles" OPEN_MENU -noext STYLES_DIR USER_STYLES_DIR WITH setstyle
+ "Themes" OPEN_MENU -noext THEMES_DIR USER_THEMES_DIR WITH setstyle
+ "Icon Sets" OPEN_MENU -noext ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
"Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)"
"Save Theme" EXEC getstyle -t USER_THEMES_DIR/"%a(Theme name)"
"Preferences Utility" EXEC #wprefs#
diff --git a/WindowMaker/background.menu b/WindowMaker/background.menu
index c3496176..fa3bef73 100644
--- a/WindowMaker/background.menu
+++ b/WindowMaker/background.menu
@@ -23,10 +23,10 @@
"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
"Gradient" END
"Images" MENU
- "Tiled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
- "Scaled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
- "Centered" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
- "Maximized" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
- "Filled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR
USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
+ "Tiled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH
wmsetbg -u -t
+ "Scaled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH
wmsetbg -u -s
+ "Centered" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH
wmsetbg -u -e
+ "Maximized" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH
wmsetbg -u -a
+ "Filled" OPEN_MENU BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH
wmsetbg -u -f
"Image" END
"Background" END
--
2.11.0
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
