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 b7a1528833cf1abbe33067570f4f0d4a09f80ebc (commit)
via 2ea61626296de392b4f72468d294bc62bf05fc9c (commit)
from 5a730d63b20e7380b10e11918ebebc9c01c9224e (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/wmaker-crm.git/commit/b7a1528833cf1abbe33067570f4f0d4a09f80ebc
commit b7a1528833cf1abbe33067570f4f0d4a09f80ebc
Author: Alexandru Lazar <ala...@startmail.com>
Date: Wed Apr 20 21:21:33 2016 +0300
getstyle: fix wcopy_file paths
Some (presumably stale) calls to wcopy_file used what appears to
be an incorrect destination which did not always exist. This patch
forces assets to be copied under <themedir>/<asset>, rather than
<themedir><absolute path of asset>. It works by first getting the
"new" path (i.e. the one that will be inserted in the property
list), which is relative to <themedir> (and appears to be always
in the root directory, too); it then copies the file to that path.
This *may* have been the original intended behaviour, as the one
it replaces clutters the path and leaks configuration data. In
addition, the style file seems to store only the file's name, not
the path relative to <themedir>, even when the file is copied with
its full hierarchy.
Signed-off-by: Alexandru Lazar <ala...@startmail.com>
diff --git a/util/getstyle.c b/util/getstyle.c
index f0de4c4..c2c61c3 100644
--- a/util/getstyle.c
+++ b/util/getstyle.c
@@ -171,7 +171,7 @@ static void findCopyFile(const char *dir, const char *file)
(void)wrmdirhier(ThemePath);
return;
}
- wcopy_file(dir, fullPath, fullPath);
+ wcopy_file(dir, fullPath, file);
wfree(fullPath);
}
@@ -234,9 +234,10 @@ static void makeThemePack(WMPropList * style, const char
*themeName)
p = strrchr(WMGetFromPLString(file), '/');
if (p) {
- wcopy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
-
newPath = wstrdup(p + 1);
+
+ wcopy_file(themeDir,
WMGetFromPLString(file), newPath);
+
WMDeleteFromPLArray(value, 1);
WMInsertInPLArray(value, 1,
WMCreatePLString(newPath));
free(newPath);
@@ -253,9 +254,10 @@ static void makeThemePack(WMPropList * style, const char
*themeName)
p = strrchr(WMGetFromPLString(file), '/');
if (p) {
- wcopy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
-
newPath = wstrdup(p + 1);
+
+ wcopy_file(themeDir,
WMGetFromPLString(file), newPath);
+
WMDeleteFromPLArray(value, 1);
WMInsertInPLArray(value, 1,
WMCreatePLString(newPath));
free(newPath);
@@ -267,9 +269,10 @@ static void makeThemePack(WMPropList * style, const char
*themeName)
p = strrchr(WMGetFromPLString(file), '/');
if (p) {
- wcopy_file(themeDir,
WMGetFromPLString(file), WMGetFromPLString(file));
-
newPath = wstrdup(p + 1);
+
+ wcopy_file(themeDir,
WMGetFromPLString(file), newPath);
+
WMDeleteFromPLArray(value, 2);
WMInsertInPLArray(value, 2,
WMCreatePLString(newPath));
free(newPath);
http://repo.or.cz/wmaker-crm.git/commit/2ea61626296de392b4f72468d294bc62bf05fc9c
commit 2ea61626296de392b4f72468d294bc62bf05fc9c
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Sun Apr 24 18:40:45 2016 -0400
wmmenugen: Fix segfault; argv[argc] doesn't exist.
diff --git a/util/wmmenugen.c b/util/wmmenugen.c
index 5839189..47e89f7 100644
--- a/util/wmmenugen.c
+++ b/util/wmmenugen.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
parse_locale(NULL, &env_lang, &env_ctry, &env_enc, &env_mod);
terminal = find_terminal_emulator();
- for (i = 1; i <= argc; i++)
+ for (i = 1; i < argc; i++)
{
if (strncmp(argv[i], "-parser", 7) == 0 &&
(argv[i][7] == '=' ||
-----------------------------------------------------------------------
Summary of changes:
util/getstyle.c | 17 ++++++++++-------
util/wmmenugen.c | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
