luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GOptionContext: Improve help in simple cases

Browse Source 
Only add [OPTION...] to the usage line if the context
has options. And shorten "Application Options" to just
"Options" if we don't have to differentiate from other
kinds of options.
This commit is contained in:
Matthias Clasen 2015-05-25 13:26:48 -04:00
parent 525bbbd6bd
commit 126c685f4a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib/goption.c
View File

@ -854,8 +854,11 @@ g_option_context_get_help (GOptionContext *context,
}
}
g_string_append_printf (string, "%s\n %s %s",
_("Usage:"), g_get_prgname(), _("[OPTION...]"));
g_string_append_printf (string, "%s\n %s", _("Usage:"), g_get_prgname());
if (context->help_enabled ||
context->main_group->n_entries > 0 ||
context->groups != NULL)
g_string_append_printf (string, " %s", _("[OPTION...]"));
if (rest_description)
{
@ -1040,7 +1043,10 @@ g_option_context_get_help (GOptionContext *context,
{
list = context->groups;
g_string_append (string, _("Application Options:"));
if (context->help_enabled || list)
g_string_append (string, _("Application Options:"));
else
g_string_append (string, _("Options:"));
g_string_append (string, "\n");
if (context->main_group)
for (i = 0; i < context->main_group->n_entries; i++)