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 ff865c31f0da746d1bf3047ee5900337625c0496 (commit)
via adc1687f98eef7e2af5866fa77aa35774e77cbbb (commit)
via ac0690b32476f3b73b8f40ad11faa734e59b534e (commit)
via c261f8ec351d1a382634f1e514c5e9576007941b (commit)
from e037ae3684928a2fbf4a3994562a322f5d3b0c71 (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 ff865c31f0da746d1bf3047ee5900337625c0496
Author: Doug Torrance <[email protected]>
Date: Thu, 6 Jul 2017 19:48:16 -0400
URL: <http://repo.or.cz/wmaker-crm.git/ff865c31f0da746d>
wmmenugen: Sort menu entries with no category into 'Other'.
---
util/wmmenugen_parse_xdg.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/util/wmmenugen_parse_xdg.c b/util/wmmenugen_parse_xdg.c
index e909f18c1836..3272ee60c53c 100644
--- a/util/wmmenugen_parse_xdg.c
+++ b/util/wmmenugen_parse_xdg.c
@@ -178,6 +178,9 @@ void parse_xdg(const char *file, cb_add_menu_entry
*addWMMenuEntryCallback)
getMenuHierarchyFor(&xdg->Category);
}
+ if (xdg->Category == NULL)
+ xdg->Category = wstrdup(_("Other"));
+
wfree(key);
key = NULL;
}
commit adc1687f98eef7e2af5866fa77aa35774e77cbbb
Author: Doug Torrance <[email protected]>
Date: Thu, 6 Jul 2017 19:48:15 -0400
URL: <http://repo.or.cz/wmaker-crm.git/adc1687f98eef7e2>
wmmenugen: Use 'Other' instead of 'Applications' for unknown categories.
From https://standards.freedesktop.org/menu-spec/latest/apa.html:
Category-based menus based on the Main Categories listed in this
specification do not provide a complete ontology for all available
applications. Category-based menu implementations SHOULD therefore provide
a "catch-all" submenu for applications that cannot be appropriately placed
elsewhere.
Emphasis on *submenu*. By using 'Applications', these menu entries were
sorted into the top level.
---
util/wmmenugen_parse_xdg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/wmmenugen_parse_xdg.c b/util/wmmenugen_parse_xdg.c
index 28d5b2811d2e..e909f18c1836 100644
--- a/util/wmmenugen_parse_xdg.c
+++ b/util/wmmenugen_parse_xdg.c
@@ -554,7 +554,7 @@ static void getMenuHierarchyFor(char **xdgmenuspec)
if (!*buf) /* come up with something if nothing found */
- snprintf(buf, sizeof(buf), "%s", _("Applications"));
+ snprintf(buf, sizeof(buf), "%s", _("Other"));
*xdgmenuspec = wstrdup(buf);
}
commit ac0690b32476f3b73b8f40ad11faa734e59b534e
Author: Doug Torrance <[email protected]>
Date: Thu, 6 Jul 2017 19:48:14 -0400
URL: <http://repo.or.cz/wmaker-crm.git/ac0690b32476f3b7>
wmmenugen: Add reserved categories.
From https://standards.freedesktop.org/menu-spec/latest/apas03.html:
Reserved Categories have a desktop-specific meaning that has not been
standardized (yet). Desktop entry files that use a reserved category MUST
also include an appropriate OnlyShowIn= entry to restrict themselves to
those environments that properly support the reserved category as used.
---
util/wmmenugen_parse_xdg.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/util/wmmenugen_parse_xdg.c b/util/wmmenugen_parse_xdg.c
index 47a2fb57d062..28d5b2811d2e 100644
--- a/util/wmmenugen_parse_xdg.c
+++ b/util/wmmenugen_parse_xdg.c
@@ -535,6 +535,19 @@ static void getMenuHierarchyFor(char **xdgmenuspec)
} else if (strcmp(p, "Utility") == 0) {
snprintf(buf, sizeof(buf), "%s", _("Utility"));
break;
+ /* reserved categories */
+ } else if (strcmp(p, "Screensaver") == 0) {
+ snprintf(buf, sizeof(buf), "%s", _("Screensaver"));
+ break;
+ } else if (strcmp(p, "TrayIcon") == 0) {
+ snprintf(buf, sizeof(buf), "%s", _("Tray Icon"));
+ break;
+ } else if (strcmp(p, "Applet") == 0) {
+ snprintf(buf, sizeof(buf), "%s", _("Applet"));
+ break;
+ } else if (strcmp(p, "Shell") == 0) {
+ snprintf(buf, sizeof(buf), "%s", _("Shell"));
+ break;
}
p = strtok(NULL, ";");
}
commit c261f8ec351d1a382634f1e514c5e9576007941b
Author: Doug Torrance <[email protected]>
Date: Thu, 6 Jul 2017 19:48:13 -0400
URL: <http://repo.or.cz/wmaker-crm.git/c261f8ec351d1a38>
wmmenugen: Add missing 'Science' menu category.
See https://standards.freedesktop.org/menu-spec/latest/apa.html
---
util/wmmenugen_parse_xdg.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/util/wmmenugen_parse_xdg.c b/util/wmmenugen_parse_xdg.c
index 31ee81309c83..47a2fb57d062 100644
--- a/util/wmmenugen_parse_xdg.c
+++ b/util/wmmenugen_parse_xdg.c
@@ -523,6 +523,9 @@ static void getMenuHierarchyFor(char **xdgmenuspec)
} else if (strcmp(p, "Office") == 0) {
snprintf(buf, sizeof(buf), "%s", _("Office"));
break;
+ } else if (strcmp(p, "Science") == 0) {
+ snprintf(buf, sizeof(buf), "%s", _("Science"));
+ break;
} else if (strcmp(p, "Settings") == 0) {
snprintf(buf, sizeof(buf), "%s", _("Settings"));
break;
-----------------------------------------------------------------------
Summary of changes:
util/wmmenugen_parse_xdg.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
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].
