diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-06-18 04:55:26 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-06-18 04:55:26 +0000 |
| commit | 3a7a09668253973235e7e48fcaf9b06051c8c3b2 (patch) | |
| tree | 43399650a47e07f7d108cf986efc1c8025acc7bf /docs | |
| parent | 2e5ed68b653c67b25e859cc77a4282d8b9d724c0 (diff) | |
| download | glib-3a7a09668253973235e7e48fcaf9b06051c8c3b2.tar.gz | |
Add G_OPTION_FLAG_NO_ARG and G_OPTION_FLAG_FILENAME to allow greater
2005-06-18 Matthias Clasen <mclasen@redhat.com>
* glib/goption.h:
* glib/goption.c: Add G_OPTION_FLAG_NO_ARG and
G_OPTION_FLAG_FILENAME to allow greater control of
G_OPTION_ARG_CALLBACK options. (#302632, Dan Winship)
* tests/option-test.c: test callback args
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/ChangeLog | 5 | ||||
| -rw-r--r-- | docs/reference/glib/tmpl/option.sgml | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 9e7d06d1d..9b13ec6bf 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2005-06-18 Matthias Clasen <mclasen@redhat.com> + + * glib/tmpl/option.sgml (GOptionFlags): document + G_OPTION_FLAG_NO_ARG and G_OPTION_FLAG_FILENAME (Dan Winship) + 2005-06-16 Mathieu Lacage <mathieu@gnome.org> * gobject/tut_gtype.xml: fix typo reported by Hong Gang XU. diff --git a/docs/reference/glib/tmpl/option.sgml b/docs/reference/glib/tmpl/option.sgml index 3aa2c1b46..d0f6acd18 100644 --- a/docs/reference/glib/tmpl/option.sgml +++ b/docs/reference/glib/tmpl/option.sgml @@ -124,9 +124,6 @@ main (int argc, char *argv[]) </para> -<!-- ##### SECTION Stability_Level ##### --> - - <!-- ##### ENUM GOptionError ##### --> <para> Error codes returned by option parsing. @@ -267,8 +264,14 @@ Flags which modify individual options. output. @G_OPTION_FLAG_IN_MAIN: The option appears in the main section of the <option>--help</option> output, even if it is defined in a group. -@G_OPTION_FLAG_REVERSE: For options of the G_OPTION_ARG_NONE kind, this flag +@G_OPTION_FLAG_REVERSE: For options of the %G_OPTION_ARG_NONE kind, this flag indicates that the sense of the option is reversed. +@G_OPTION_FLAG_NO_ARG: For options of the %G_OPTION_ARG_CALLBACK kind, + this flag indicates that the callback does not take any argument + (like a %G_OPTION_ARG_NONE option). Since 2.8 +@G_OPTION_FLAG_FILENAME: For options of the %G_OPTION_ARG_CALLBACK + kind, this flag indicates that the argument should be passed to the + callback in the GLib filename encoding rather than UTF-8. Since 2.8 <!-- ##### MACRO G_OPTION_REMAINING ##### --> <para> |