This is an automated email generated because a ref change occurred in the
git repository for project wmaker-crm.git.
The branch, next has been updated
via e037ae3684928a2fbf4a3994562a322f5d3b0c71 (commit)
from 83f0b764e607306feb7b17026a11034e5cf84785 (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 -----------------------------------------------------------------
commit e037ae3684928a2fbf4a3994562a322f5d3b0c71
Author: Christophe CURIS <[email protected]>
Date: Sun, 2 Jul 2017 23:01:49 +0200
URL: <http://repo.or.cz/wmaker-crm.git/e037ae3684928a2f>
util: fix parsing of XDG menus with multiple groups
The specification for XDG menu files allows having more than one group and
assumes no constraint on their order. The original code assumed that once
the proper group marker was found, everything after was part of it, causing
misinterpretation of some data, like taking the wrong launch command.
This patch stops the parsing of the menu XDG file when a new group is
found, hence implementing the expected behaviour.
Reported-by: Andreas Metzler <[email protected]>
---
util/wmmenugen_parse_xdg.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/util/wmmenugen_parse_xdg.c b/util/wmmenugen_parse_xdg.c
index fc5f6b19e312..31ee81309c83 100644
--- a/util/wmmenugen_parse_xdg.c
+++ b/util/wmmenugen_parse_xdg.c
@@ -132,6 +132,11 @@ void parse_xdg(const char *file, cb_add_menu_entry
*addWMMenuEntryCallback)
/* start processing group */
memset(buf, 0, sizeof(buf));
continue;
+ } else if (p[0] == '[') {
+ /* If we find a new group and the previous group was
the main one,
+ * we stop all further processing
+ */
+ if (InGroup) break;
}
if (!InGroup) {
-----------------------------------------------------------------------
Summary of changes:
util/wmmenugen_parse_xdg.c | 5 +++++
1 file changed, 5 insertions(+)
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].
