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, master has been updated
via 3bc2535968cf37b63ad99e49f91a73a332d5553a (commit)
via 85b4dba721d3220c2ef20609f32dedc9389915a8 (commit)
from f6b7cb39b9f949b26746adcfb72e8a110aa445e5 (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/3bc2535968cf37b63ad99e49f91a73a332d5553a
commit 3bc2535968cf37b63ad99e49f91a73a332d5553a
Author: Carlos R. Mafra <[email protected]>
Date: Fri Feb 3 01:15:05 2012 +0000
Fix getstyle, again
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...
diff --git a/util/getstyle.c b/util/getstyle.c
index feb0277..bde802d 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -277,7 +277,7 @@ void makeThemePack(WMPropList * style, char *themeName)
int main(int argc, char **argv)
{
WMPropList *prop, *style, *key, *val;
- char *path, *p;
+ char *path;
int i, ch, theme_too = 0, make_pack = 0;
char *style_file = NULL;
@@ -315,15 +315,8 @@ int main(int argc, char **argv)
if (argc - optind > 1)
print_help(0, 1);
- if (argc - optind == 1) {
+ if (argc - optind == 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) {
printf("%s: you must supply a name for the theme packn",
__progname);
http://repo.or.cz/w/wmaker-crm.git/commit/85b4dba721d3220c2ef20609f32dedc9389915a8
commit 85b4dba721d3220c2ef20609f32dedc9389915a8
Author: Carlos R. Mafra <[email protected]>
Date: Thu Feb 2 23:47:54 2012 +0000
Revert "getstyle: Remove dead code"
This reverts commit e06b3005e833d4c34f9b5671daa0cc44f4f9ea52.
diff --git a/util/getstyle.c b/util/getstyle.c
index e7afbe4..feb0277 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -401,7 +401,11 @@ int main(int argc, char **argv)
WMWritePropListToFile(style, path);
wfree(path);
} else {
- puts(WMGetPropListDescription(style, True));
+ if (style_file) {
+ WMWritePropListToFile(style, style_file);
+ } else {
+ puts(WMGetPropListDescription(style, True));
+ }
}
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
util/getstyle.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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].
