luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 04:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

GOptionContext: Don't show headings without options

Browse Source 
If the only entry in the main group is for the rest args,
don't bother printing "Application Options".
This commit is contained in:
Matthias Clasen 2012-06-29 13:47:15 -04:00
parent 08cfcdc81a
commit 64bfbc2cf0
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/goption.c
View File

@ -639,6 +639,8 @@ group_has_visible_entries (GOptionContext *context,
if (main_entries && !main_group && !(entry->flags & G_OPTION_FLAG_IN_MAIN)) if (main_entries && !main_group && !(entry->flags & G_OPTION_FLAG_IN_MAIN))
continue; continue;
if (entry->long_name[0] == 0) /* ignore rest entry */
continue;
if (!(entry->flags & reject_filter)) if (!(entry->flags & reject_filter))
return TRUE; return TRUE;
} }

27
glib/tests/option-context.c
View File

@ -1992,6 +1992,30 @@ test_help (void)
g_option_context_free (context); g_option_context_free (context);
} }
static void
test_help_no_options (void)
{
GOptionContext *context;
gchar **sarr = NULL;
GOptionEntry entries[] = {
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &sarr, "Rest goes here", "REST" },
{ NULL }
};
gchar *str;
context = g_option_context_new ("blabla");
g_option_context_add_main_entries (context, entries, NULL);
str = g_option_context_get_help (context, FALSE, NULL);
g_assert (strstr (str, "blabla") != NULL);
g_assert (strstr (str, "REST") != NULL);
g_assert (strstr (str, "Help Options") != NULL);
g_assert (strstr (str, "Application Options") == NULL);
g_free (str);
g_option_context_free (context);
}
static void static void
set_bool (gpointer data) set_bool (gpointer data)
{ {
@ -2198,7 +2222,8 @@ main (int argc,
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_bug_base ("http://bugzilla.gnome.org/"); g_test_bug_base ("http://bugzilla.gnome.org/");
g_test_add_func ("/option/help", test_help); g_test_add_func ("/option/help/options", test_help);
g_test_add_func ("/option/help/no-options", test_help_no_options);
g_test_add_func ("/option/basic", test_basic); g_test_add_func ("/option/basic", test_basic);
g_test_add_func ("/option/group/captions", test_group_captions); g_test_add_func ("/option/group/captions", test_group_captions);