Use g_print to print out --help text in locale encoding. (#469551, Takao

2007-11-23  Matthias Clasen  <mclasen@redhat.com>

        * glib/goption.c: Use g_print to print out --help text in
        locale encoding.  (#469551, Takao Fujiwara)



svn path=/branches/glib-2-14/; revision=5923
This commit is contained in:
Matthias Clasen
2007-11-24 06:01:58 +00:00
committed by Matthias Clasen
parent 46e8950f77
commit 42c934d8b9
2 changed files with 11 additions and 3 deletions

View File

@@ -1,3 +1,10 @@
2007-11-24 Matthias Clasen <mclasen@redhat.com>
Merge from trunk:
* glib/goption.c: Use g_print to print out --help text in
locale encoding. (#469551, Takao Fujiwara)
2007-11-24 Matthias Clasen <mclasen@redhat.com> 2007-11-24 Matthias Clasen <mclasen@redhat.com>
Merge from trunk: Merge from trunk:

View File

@@ -205,8 +205,9 @@ g_option_error_quark (void)
* program functionality that should be displayed as a paragraph * program functionality that should be displayed as a paragraph
* below the usage line, use g_option_context_set_summary(). * below the usage line, use g_option_context_set_summary().
* *
* Note that the @parameter_string is translated (see * Note that the @parameter_string is translated using the
* g_option_context_set_translate_func()). * function set with g_option_context_set_translate_func(), so
* it should normally be passed untranslated.
* *
* Returns: a newly created #GOptionContext, which must be * Returns: a newly created #GOptionContext, which must be
* freed with g_option_context_free() after use. * freed with g_option_context_free() after use.
@@ -771,7 +772,7 @@ print_help (GOptionContext *context,
gchar *help; gchar *help;
help = g_option_context_get_help (context, main_help, group); help = g_option_context_get_help (context, main_help, group);
g_printf (help); g_print ("%s", help);
g_free (help); g_free (help);
exit (0); exit (0);