don't replace the usage line with the description for optional parameters,

2007-06-05  Vincent Untz  <vuntz@gnome.org>

	* glib/goption.c: (g_option_context_get_help): don't replace the usage
	line with the description for optional parameters, but append the
	description. (#444130)

svn path=/trunk/; revision=5534
This commit is contained in:
Vincent Untz 2007-06-05 08:44:20 +00:00 committed by Vincent Untz
parent 8c2f0b709f
commit cc4b0a5452
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2007-06-05 Vincent Untz <vuntz@gnome.org>
* glib/goption.c: (g_option_context_get_help): don't replace the usage
line with the description for optional parameters, but append the
description. (#444130)
2007-06-04 Matthias Clasen <mclasen@redhat.com> 2007-06-04 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version * configure.in: Bump version

View File

@ -573,14 +573,14 @@ g_option_context_get_help (GOptionContext *context,
if (rest_description) if (rest_description)
{ {
g_string_printf (string, " "); g_string_append (string, " ");
g_string_printf (string, rest_description); g_string_append (string, rest_description);
} }
if (context->parameter_string) if (context->parameter_string)
{ {
g_string_printf (string, " "); g_string_append (string, " ");
g_string_printf (string, TRANSLATE (context, context->parameter_string)); g_string_append (string, TRANSLATE (context, context->parameter_string));
} }
g_string_append (string, "\n\n"); g_string_append (string, "\n\n");