This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 3981805ec78adf4479f0988cfc2174a02d58a738 (commit)
from ada8a4876bfe0cefba5e1b002948b3c571f285a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/3981805ec78adf4479f0988cfc2174a02d58a738
commit 3981805ec78adf4479f0988cfc2174a02d58a738
Author: Carlos R. Mafra <[email protected]>
Date: Thu Apr 10 19:34:48 2014 +0100
wmgenmenu: Write paths according to options set at configure time
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.
diff --git a/util/wmgenmenu.c b/util/wmgenmenu.c
index 056eba99..aff43a70 100644
--- a/util/wmgenmenu.c
+++ b/util/wmgenmenu.c
@@ -41,6 +41,12 @@ int main(int argc, char *argv[])
{
char *t;
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[] = {
{ "version", no_argument, NULL, 'v' },
@@ -152,7 +158,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Themes")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes
$HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ WMCreatePLString(theme_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -161,7 +167,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Styles")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles
$HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ WMCreatePLString(style_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -170,7 +176,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Icon Sets")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets
$HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ WMCreatePLString(icon_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
-----------------------------------------------------------------------
Summary of changes:
util/wmgenmenu.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
