From 325f1e3eb54d3969d3be104481fa1097ffa37d7b Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 24 Feb 2020 08:52:13 +0000 Subject: [PATCH 1/2] gapplication: Consistently use non-copying variant formats in docs In particular, this fixes the invalid format string `&as`. Signed-off-by: Philip Withnall Fixes: #2044 --- gio/gapplication.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/gapplication.c b/gio/gapplication.c index 02ab2b046..695a74f5f 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -706,9 +706,9 @@ add_packed_option (GApplication *application, * - for %G_OPTION_ARG_INT, use i * - for %G_OPTION_ARG_INT64, use x * - for %G_OPTION_ARG_DOUBLE, use d - * - for %G_OPTION_ARG_FILENAME, use ^ay - * - for %G_OPTION_ARG_STRING_ARRAY, use &as - * - for %G_OPTION_ARG_FILENAME_ARRAY, use ^aay + * - for %G_OPTION_ARG_FILENAME, use ^&ay + * - for %G_OPTION_ARG_STRING_ARRAY, use ^a&s + * - for %G_OPTION_ARG_FILENAME_ARRAY, use ^a&ay * * Since: 2.40 */ From b604f008f776083f336cb622ab3b25272fc7c164 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 24 Feb 2020 08:53:10 +0000 Subject: [PATCH 2/2] gapplication: Improve formatting of variant formats in documentation This makes the documentation a little easier to read. Signed-off-by: Philip Withnall --- gio/gapplication.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gio/gapplication.c b/gio/gapplication.c index 695a74f5f..c884ade97 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -701,14 +701,14 @@ add_packed_option (GApplication *application, * * It is important to use the proper GVariant format when retrieving * the options with g_variant_dict_lookup(): - * - for %G_OPTION_ARG_NONE, use b - * - for %G_OPTION_ARG_STRING, use &s - * - for %G_OPTION_ARG_INT, use i - * - for %G_OPTION_ARG_INT64, use x - * - for %G_OPTION_ARG_DOUBLE, use d - * - for %G_OPTION_ARG_FILENAME, use ^&ay - * - for %G_OPTION_ARG_STRING_ARRAY, use ^a&s - * - for %G_OPTION_ARG_FILENAME_ARRAY, use ^a&ay + * - for %G_OPTION_ARG_NONE, use `b` + * - for %G_OPTION_ARG_STRING, use `&s` + * - for %G_OPTION_ARG_INT, use `i` + * - for %G_OPTION_ARG_INT64, use `x` + * - for %G_OPTION_ARG_DOUBLE, use `d` + * - for %G_OPTION_ARG_FILENAME, use `^&ay` + * - for %G_OPTION_ARG_STRING_ARRAY, use `^a&s` + * - for %G_OPTION_ARG_FILENAME_ARRAY, use `^a&ay` * * Since: 2.40 */