Commit Graph

80 Commits

Author SHA1 Message Date
Stefan Kost
dda20bccbf goption: format section docs according to gtk-doc rules and fixes broken xml 2009-04-21 23:21:28 +03:00
Stefan Kost
57bd24dc49 goption: document that some option args need to be freed by the callee
Option arguments where the result is stored in a string or string array need to
be freed by the owner of the option group. Fixes #578363.
2009-04-21 17:50:00 +03:00
Stefan Kost
2026c232b3 goption: move docs from tmpl folder to inline comments 2009-04-21 16:35:26 +03:00
Tor Lillqvist
ed2e6c0814 Guard against a mis-written GOptionArgFunc that has returned FALSE but not
2009-01-12  Tor Lillqvist  <tml@novell.com>

	* glib/goption.c (parse_arg): Guard against a mis-written
	GOptionArgFunc that has returned FALSE but not set the GError.


svn path=/trunk/; revision=7804
2009-01-12 11:45:52 +00:00
Matthias Clasen
736bea99fe Fix a wrong reference in the docs, reported by Takeshi Aihana.
* glib/goption.c: Fix a wrong reference in the docs, reported by
        Takeshi Aihana.


svn path=/trunk/; revision=7758
2009-01-02 02:49:06 +00:00
Matthias Clasen
0f6b25ca96 Fix some compiler warnings
svn path=/trunk/; revision=7755
2008-12-31 05:51:47 +00:00
Matthias Clasen
636fa4640d Fix an issue with callbacks that return FALSE.
svn path=/trunk/; revision=7684
2008-11-28 05:17:27 +00:00
Christian Persch
ec59607150 Bug 559413 – g_option_group_set_error_hook docs buglet
svn path=/trunk/; revision=7675
2008-11-23 21:16:06 +00:00
Michael Natterer
4622ed8cfc changed return value to const gchar* to fix warning.
2008-06-16  Michael Natterer  <mitch@imendio.com>

	* glib/goption.c (dgettext_swapped): changed return value to
	const gchar* to fix warning.


svn path=/trunk/; revision=7046
2008-06-16 09:25:57 +00:00
Behdad Esfahbod
e0916c3f54 Bug 503071 – Application direction changes to right to left even if
2008-06-11  Behdad Esfahbod  <behdad@gnome.org>

        Bug 503071 – Application direction changes to right to left even if
        theres no translation

        * glib/gi18n-lib.h:
        * glib/glib.symbols:
        * glib/gstrfuncs.h:
        * glib/gstrfuncs.c:
        Add new functions g_dgettext() and g_dngettext().

        * glib/gutils.c (glib_gettext):
        * glib/gfileutils.c (g_format_size_for_display):
        * glib/goption.c (dgettext_swapped):
        Use the new functions.


svn path=/trunk/; revision=7020
2008-06-11 23:37:49 +00:00
Matthias Clasen
76e53c6ed3 Removed unused variable is_main_group. (#512381, Wouter Bolsterlee)
2008-01-27  Matthias Clasen  <mclasen@redhat.com>

        * glib/goption.c: (group_list_has_visible_entries):
        Removed unused variable is_main_group.  (#512381,
        Wouter Bolsterlee)



svn path=/trunk/; revision=6390
2008-01-27 23:57:32 +00:00
Loïc Minier
64c2dc4a06 Pass context down the implementation to check for the main_group. Bug
2008-01-25  Loïc Minier  <lool@dooz.org>

       * glib/goption.c: (group_has_visible_entries),
       (group_list_has_visible_entires), (g_option_context_get_help): Pass
       context down the implementation to check for the main_group.
       Bug #510292.
       * glib/tests/option-context.c:
       Don't set G_OPTION_FLAG_IN_MAIN in main_entries
       (group_captions): only create group when actually adding it to the
       context; add an exit(0) to make sure the test succeeds.

svn path=/trunk/; revision=6377
2008-01-25 17:49:53 +00:00
Mathias Hasselmann
005a22ab10 Do not show empty groups in --help output. Initial patch from Yevgen
Muntyan. (#504142)

* glib/goption.c: Do not show empty groups in --help output.
* glib/tests/Makefile.am: Add option-context.c
* glib/tests/option-context.c: Test skipping of empty groups.

svn path=/trunk/; revision=6198
2007-12-24 11:09:03 +00:00
Matthias Clasen
0d723a240e 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=/trunk/; revision=5916
2007-11-23 05:58:51 +00:00
Matthias Clasen
62ba4fa91a Improve the docs. (#436293, Vincent Untz)
2007-11-08  Matthias Clasen <mclasen@redhat.com>

        * glib/goption.c (g_option_context_new): Improve the docs.
        (#436293, Vincent Untz)


svn path=/trunk/; revision=5834
2007-11-09 02:50:44 +00:00
Vincent Untz
cc4b0a5452 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
2007-06-05 08:44:20 +00:00
Matthias Clasen
d5b622fcc4 Fix a doc typo. (#439232, Vincent Untz)
2007-05-17  Matthias Clasen  <mclasen@redhat.com>

        * glib/goption.c (g_option_context_set_translate_func): Fix
        a doc typo.  (#439232, Vincent Untz)


svn path=/trunk/; revision=5500
2007-05-17 17:43:07 +00:00
Matthias Clasen
8f88ba6ffa Allow G_OPTION_ARG_CALLBACK for G_OPTION_REMAINING. (#437297, Dave Benson)
2007-05-11  Matthias Clasen  <mclasen@redhat.com>

        * glib/goption.c: Allow G_OPTION_ARG_CALLBACK for
        G_OPTION_REMAINING.  (#437297, Dave Benson)

        * tests/option-test.c: Add a test for this.



svn path=/trunk/; revision=5487
2007-05-11 18:53:57 +00:00
Matthias Clasen
ba2dc0c2b2 New function to get the formatted help string. (#336089, Dom Lachowicz)
2007-04-24  Matthias Clasen  <mclasen@redhat.com>

        * glib/glib.symbols:
        * glib/goption.h:
        * glib/goption.c (g_option_context_get_help): New function to
        get the formatted help string.  (#336089, Dom Lachowicz)



svn path=/trunk/; revision=5456
2007-04-25 03:53:30 +00:00
Matthias Clasen
3ecf6f3506 Use bitwise & when operating on flags. (#399971, Jon Oberheide)
2007-01-23  Matthias Clasen  <mclasen@redhat.com>

        * glib/goption.c (print_help): Use bitwise &
        when operating on flags.  (#399971, Jon Oberheide)



svn path=/trunk/; revision=5308
2007-01-24 04:02:33 +00:00
Behdad Esfahbod
9eeb9297d5 Remove unneeded strlen.
svn path=/trunk/; revision=5205
2007-01-03 23:09:12 +00:00
Behdad Esfahbod
d2a9b31e61 Take zerowidth and double-width chars into consideration when computing
2007-01-03  Behdad Esfahbod  <behdad@gnome.org>

        * glib/goption.c (_g_unichar_get_width), (_g_utf8_strwidth),
        (calculate_max_length), (print_entry), (print_help): Take zerowidth
        and double-width chars into consideration when computing width of a
        string.  Also fix another bug in width computation.

        * glib/guniprop.c (g_unichar_iszerowidth): Fix typo.  It was not
        working correctly.


svn path=/trunk/; revision=5204
2007-01-03 23:05:36 +00:00
Matthias Clasen
700b6c4b87 forgotten file 2006-12-27 23:08:52 +00:00
Matthias Clasen
75aa0676a0 Forgotten file 2006-05-20 03:16:46 +00:00
Matthias Clasen
a052fd1202 Allow optional summary and description texts before and after the option
2006-05-13  Matthias Clasen  <mclasen@redhat.com>

	* glib/glib.symbols:
	* glib/goption.h:
	* glib/goption.c: Allow optional summary and description
	texts before and after the option descriptions, and add
	a way to translate them.  (#336120, Behdad Esfahbod)
2006-05-13 04:23:38 +00:00
Bastien Nocera
93ec25ad67 add documentation for G_OPTION_ARG_INT64
2006-05-11  Bastien Nocera  <hadess@hadess.net>

	* glib/tmpl/option.sgml: add documentation for G_OPTION_ARG_INT64

2006-05-11  Bastien Nocera  <hadess@hadess.net>

	* glib/goption.c: (parse_int64), (parse_arg), (free_changes_list):
	* glib/goption.h:
	* tests/option-test.c: (arg_test6), (main): add an int64 type for
	GOption (G_OPTION_ARG_INT64) (#341237)
2006-05-11 18:37:15 +00:00
Tim Janik
34ee852317 fixed leak in short option parsing. rewrote parts of the code to be more
Tue May  2 14:18:25 2006  Tim Janik  <timj@gtk.org>

        * glib/goption.c (g_option_context_parse): fixed leak in short
        option parsing. rewrote parts of the code to be more concise to
        enhance readability. fixed exaggerated uses of strlen.
2006-05-02 12:20:39 +00:00
Matthias Clasen
75ed18d067 Add an assert to make it clear when value can be NULL.
2006-04-12  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_arg): Add an assert to make it
	clear when value can be NULL.
2006-04-12 15:38:27 +00:00
Matthias Clasen
b58fb2bdb5 Move short_month_names and long_month_names to bss.
2006-04-04  Matthias Clasen  <mclasen@redhat.com>

        * glib/gdate.c: Move short_month_names and long_month_names
        to bss.

        * glib/gspawn-win32.c (g_spawn_error_quark):
        * glib/gspawn.c (g_spawn_error_quark):
        * glib/gshell.c (g_shell_error_quark):
        * glib/gmarkup.c (g_markup_error_quark):
        * glib/goption.c (g_option_error_quark):
        * glib/gkeyfile.c (g_key_file_error_quark):
        * glib/giochannel.c (g_io_channel_error_quark):
        * glib/gfileutils.c (g_file_error_quark):
        * glib/gconvert.c (g_convert_error_quark):
        * glib/gbookmarkfile.c (g_bookmark_file_error_quark):
        * glib/gthread.c (g_thread_error_quark): No point in making
        the error path fast by caching quarks.

        * glib/gbookmarkfile.c: Make the parser struct const.
2006-04-04 04:37:39 +00:00
Matthias Clasen
9749aa87e5 Support floating point arguments in goption 2006-03-27 06:57:28 +00:00
Matthias Clasen
a205620a88 Improve the description of parameter_string in the docs. (#336085, Claudio
2006-03-26  Matthias Clasen  <mclasen@redhat.com>

        * glib/goption.c (g_option_context_new): Improve the description
        of parameter_string in the docs.  (#336085, Claudio Saavedra)
2006-03-26 20:15:19 +00:00
Matthias Clasen
79a5c739a4 Only set the prgname if it hasn't been set before. (#334611, Chong Kai
2006-03-15  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (g_option_context_parse): Only set the prgname
	if it hasn't been set before.  (#334611, Chong Kai Xiong)
2006-03-15 13:03:48 +00:00
Matthias Clasen
99024c7ea7 Don't create the option_name twice. (#334519, Chris Wilson)
2006-03-14  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_short_option): Don't create the
	option_name twice.  (#334519, Chris Wilson)
2006-03-14 15:34:54 +00:00
Matthias Clasen
df21b345c5 Set an error in all failure cases. (#324332, Tim-Philipp Müller)
2005-12-17  Matthias Clasen  <mclasen@redhat.com>

        * glib/goption.c (parse_short_option): Set an error in all
        failure cases.  (#324332, Tim-Philipp Müller)
2005-12-18 02:46:27 +00:00
Matthias Clasen
5f70ee19f8 Include glibintl.h, not gi18n.h, noticed by Dan Winship.
2005-07-26  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c: Include glibintl.h, not gi18n.h, noticed
	by Dan Winship.
2005-07-26 19:41:05 +00:00
Matthias Clasen
7b70e24179 Warn if a short name is not acceptable.
2005-07-13  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (g_option_group_add_entries): Warn if a
	short name is not acceptable.
2005-07-13 13:31:30 +00:00
Matthias Clasen
58dd4814b2 Add and implement a new flag to turn off the automatic <groupname>-
2005-07-12  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.h (G_OPTION_FLAG_NOALIAS):
	* glib/goption.c: Add and implement a new flag
	to turn off the automatic <groupname>- prefixing
	for conflict resolution of long option names. (#171840,
	Adam McLaurin)

	All optional callback arguments  (#308886, Pawel
	Sliwowski)

	* glib/goption.h (G_OPTION_FLAG_OPTIONAL_ARG):
	* glib/goption.c: Add and implement a new flag
	to indicate that a callback *optionally* takes another
	argument.

	* tests/option-test.c: Add tests for optional arguments.
2005-07-12 18:56:25 +00:00
Matthias Clasen
f8411a5b97 Properly store changes for arrays. (#308528, Roger Leigh)
2005-06-22  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_arg): Properly store changes for arrays.  (#308528,
	Roger Leigh)
2005-06-22 17:09:31 +00:00
Matthias Clasen
0c2739405c Pass the option name also in the NO_ARG case. (#308602, Masatake YAMATO)
2005-06-22  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_short_option, parse_long_option):
	Pass the option name also in the NO_ARG case.  (#308602,
	Masatake YAMATO)
2005-06-22 16:24:22 +00:00
Matthias Clasen
3a7a096682 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
2005-06-18 04:55:26 +00:00
Matthias Clasen
e90cd618b1 Set errno to 0 before calling strtol. (#306388, Morten Welinder)
2005-06-09  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_int): Set errno to 0 before calling
	strtol.  (#306388, Morten Welinder)
2005-06-09 15:39:29 +00:00
Manish Singh
ba5a4d9db6 initialize option_name before using it.
Fri May 27 17:18:00 2005  Manish Singh  <yosh@gimp.org>

        * glib/goption.c (parse_short_option): initialize option_name
        before using it.
2005-05-28 00:19:14 +00:00
Matthias Clasen
4c4f106344 Return an error if an option is missing its argument. (#305576, Björn
2005-05-27  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_short_option, parse_long_option):
	Return an error if an option is missing its argument.  (#305576,
	Björn Lindqvist)

	* tests/option-test.c (missing_arg_test): Add a testcase.
2005-05-27 18:30:34 +00:00
Manish Singh
1397c53eb7 rest_description should be const.
Wed May 25 15:33:51 2005  Manish Singh  <yosh@gimp.org>

        * glib/goption.c (print_help): rest_description should be const.
2005-05-25 22:37:48 +00:00
Matthias Clasen
0b8e42a2f5 If the remaining argument has an arg_description, display the synopsis as
2005-05-24  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (print_help): If the remaining argument
	has an arg_description, display the synopsis as
	PROGNAME [OPTION...] REST  (#305346, Noah Levitt)
2005-05-25 02:42:21 +00:00
Matthias Clasen
6e60dd8489 Add a testcase.
2005-05-06  Matthias Clasen  <mclasen@redhat.com>

	* tests/option-test.c: Add a testcase.

	* glib/goption.c (g_option_context_parse): Treat '-'
	on its own as a non-option argument.  (#168008, Tim Musson,
	Thomas Leonard and others)
2005-05-06 20:10:52 +00:00
Matthias Clasen
4faa0650e5 Warn if there already is a main group. (#170445, Jeff Franks)
2005-03-15  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (g_option_context_set_main_group): Warn
	if there already is a main group.  (#170445, Jeff Franks)
2005-03-15 13:24:22 +00:00
Matthias Clasen
608a31b98e Make PLT-reduction work with gcc4, and don't include everything in
2005-03-13  Matthias Clasen  <mclasen@redhat.com>

	Make PLT-reduction work with gcc4, and don't include
	everything in galias.h:

	* glib/glib.symbols: Group symbols by header and source file.
	* glib/makegalias.pl: Protect definitions by the same
	preprocessor symbols used to guard the headers. Move
	the alias declarations to a separate file which is
	produced when calling makegalias.pl -def
	* glib/Makefile.am (galiasdef.c): Add a rule to generate this
	file.
	* glib/*.c: Include galias.h after the other GLib headers,
	include galiasdef.c at the bottom.
2005-03-14 04:26:57 +00:00
Matthias Clasen
0fa2c2b366 Fix an error message. (#168751, Hazael Maldonado Torres)
2005-03-08  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_int): Fix an error message.
	(#168751, Hazael Maldonado Torres)
2005-03-08 05:20:47 +00:00
Matthias Clasen
1795e0aeb0 Take main group options into account when calculating column size.
2005-02-10  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (print_help): Take main group options into
	account when calculating column size.  (#166921)
	(g_option_context_parse): Accept -? as documented.  (#166977)
2005-02-11 04:11:34 +00:00