gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-07 14:24:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix getstyle, again

Browse Source 
As reported by Paul Seelig, it used to be the case that

getstyle -t ~/GNUstep/Library/WindowMaker/Themes/somefile

would save the current theme, and all old menus (WMRootMenu) were
relying on this.

The problem was that the following piece (from commit 6bf79945)

	if (style_file && !make_pack)
		print_help(0, 1);

would allow a style_file to be specified and saved to only with the
option -p (which implies make_pack), therefore saving a theme with
-t like the root menu used to do no longer worked.

Now things work fine:

[mafra@Pilar:~]$ ls GNUstep/
Applications/  Apps/  Defaults/  Library/
[mafra@Pilar:~]$ getstyle -t ~/GNUstep/theme
[mafra@Pilar:~]$ ls GNUstep/
Applications/  Apps/  Defaults/  Library/  theme

But also note that trying to save a theme outside of GNUstep/
is not allowed and it prints no error message - perhaps it should...
This commit is contained in:
Carlos R. Mafra
2012-02-03 01:15:05 +00:00
parent 85b4dba721
commit 3bc2535968
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util/getstyle.c
View File

@@ -277,7 +277,7 @@ void makeThemePack(WMPropList * style, char *themeName)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
WMPropList *prop, *style, *key, *val; WMPropList *prop, *style, *key, *val;
char *path, *p; char *path;
int i, ch, theme_too = 0, make_pack = 0; int i, ch, theme_too = 0, make_pack = 0;
char *style_file = NULL; char *style_file = NULL;
@@ -315,15 +315,8 @@ int main(int argc, char **argv)
if (argc - optind > 1) if (argc - optind > 1)
print_help(0, 1); print_help(0, 1);
if (argc - optind == 1) { if (argc - optind == 1)
style_file = argv[argc - 1]; style_file = argv[argc - 1];
while ((p = strchr(style_file, '/')) != NULL)
*p = '_';
}
/* A theme name was given but the option to create it (-p) was not */
if (style_file && !make_pack)
print_help(0, 1);
if (make_pack && !style_file) { if (make_pack && !style_file) {
printf("%s: you must supply a name for the theme pack\n", __progname); printf("%s: you must supply a name for the theme pack\n", __progname);