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

wmgenmenu: Write paths according to options set at configure time

Browse Source 
As reported by Shawn W Dunn, the configuration strings written by wmgenmenu
in $HOME/GNUstep/Defaults/WMRootMenu were not reflecting his installation
directories choices.

Fix this by writing strings composed with PKGDATADIR.
This commit is contained in:
Carlos R. Mafra
2014-04-10 19:34:48 +01:00
parent c2e4f62777
commit 17c93f0947
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/wmgenmenu.c
View File

@@ -41,6 +41,12 @@ int main(int argc, char *argv[])
{ {
char *t; char *t;
int ch; int ch;
char *tmp, *theme_paths, *style_paths, *icon_paths;
tmp = wstrconcat("-noext ", PKGDATADIR);
theme_paths = wstrconcat(tmp, "/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle");
style_paths = wstrconcat(tmp, "/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle");
icon_paths = wstrconcat(tmp, "/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons");
struct option longopts[] = { struct option longopts[] = {
{ "version", no_argument, NULL, 'v' }, { "version", no_argument, NULL, 'v' },
@@ -152,7 +158,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray( L2Menu = WMCreatePLArray(
WMCreatePLString(_("Themes")), WMCreatePLString(_("Themes")),
WMCreatePLString("OPEN_MENU"), WMCreatePLString("OPEN_MENU"),
WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"), WMCreatePLString(theme_paths),
NULL NULL
); );
WMAddToPLArray(L1Menu, L2Menu); WMAddToPLArray(L1Menu, L2Menu);
@@ -161,7 +167,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray( L2Menu = WMCreatePLArray(
WMCreatePLString(_("Styles")), WMCreatePLString(_("Styles")),
WMCreatePLString("OPEN_MENU"), WMCreatePLString("OPEN_MENU"),
WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"), WMCreatePLString(style_paths),
NULL NULL
); );
WMAddToPLArray(L1Menu, L2Menu); WMAddToPLArray(L1Menu, L2Menu);
@@ -170,7 +176,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray( L2Menu = WMCreatePLArray(
WMCreatePLString(_("Icon Sets")), WMCreatePLString(_("Icon Sets")),
WMCreatePLString("OPEN_MENU"), WMCreatePLString("OPEN_MENU"),
WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"), WMCreatePLString(icon_paths),
NULL NULL
); );
WMAddToPLArray(L1Menu, L2Menu); WMAddToPLArray(L1Menu, L2Menu);