From 1e01b9079d5299a86f88377badee8b686ed03a05 Mon Sep 17 00:00:00 2001 From: Sophie Herold Date: Sat, 21 Nov 2020 16:33:40 +0100 Subject: [PATCH] Fix some nullable return annotations --- gtk/gtkaboutdialog.c | 2 +- gtk/gtkactionable.c | 2 +- gtk/gtkappchooserwidget.c | 2 +- gtk/gtkapplication.c | 4 ++-- gtk/gtkentry.c | 2 +- gtk/gtklabel.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 4fde9d2299..745b45ea9b 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -945,7 +945,7 @@ update_website (GtkAboutDialog *about) * * Returns the program name displayed in the about dialog. * - * Returns: The program name. The string is owned by the about + * Returns: (nullable): The program name. The string is owned by the about * dialog and must not be modified. */ const char * diff --git a/gtk/gtkactionable.c b/gtk/gtkactionable.c index 150a91055b..f2a38fe71d 100644 --- a/gtk/gtkactionable.c +++ b/gtk/gtkactionable.c @@ -130,7 +130,7 @@ gtk_actionable_set_action_name (GtkActionable *actionable, * * See gtk_actionable_set_action_target_value() for more information. * - * Returns: (transfer none): the current target value + * Returns: (nullable) (transfer none): the current target value **/ GVariant * gtk_actionable_get_action_target_value (GtkActionable *actionable) diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c index 7c4da1d85f..65076c3591 100644 --- a/gtk/gtkappchooserwidget.c +++ b/gtk/gtkappchooserwidget.c @@ -1369,7 +1369,7 @@ gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, * Returns the text that is shown if there are not applications * that can handle the content type. * - * Returns: the value of #GtkAppChooserWidget:default-text + * Returns: (nullable): the value of #GtkAppChooserWidget:default-text */ const char * gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self) diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index 2806cd7cf4..7b438f1581 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -888,7 +888,7 @@ gtk_application_set_menubar (GtkApplication *application, * Returns the menu model that has been set with * gtk_application_set_menubar(). * - * Returns: (transfer none): the menubar for windows of @application + * Returns: (nullable) (transfer none): the menubar for windows of @application */ GMenuModel * gtk_application_get_menubar (GtkApplication *application) @@ -1174,7 +1174,7 @@ gtk_application_handle_window_map (GtkApplication *application, * See [Automatic resources][automatic-resources] * for more information. * - * Returns: (transfer none): Gets the menu with the + * Returns: (nullable) (transfer none): Gets the menu with the * given id from the automatically loaded resources */ GMenu * diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index b5ebbe2b14..a4cf3b30f8 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -3245,7 +3245,7 @@ gtk_entry_set_completion (GtkEntry *entry, * * Returns the auxiliary completion object currently in use by @entry. * - * Returns: (transfer none): The auxiliary completion object currently + * Returns: (nullable) (transfer none): The auxiliary completion object currently * in use by @entry. */ GtkEntryCompletion * diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 4e17a5ba1b..58c7431814 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -5942,7 +5942,7 @@ gtk_label_set_extra_menu (GtkLabel *self, * * Gets the menu model set with gtk_label_set_extra_menu(). * - * Returns: (transfer none): (nullable): the menu model + * Returns: (transfer none) (nullable): the menu model */ GMenuModel * gtk_label_get_extra_menu (GtkLabel *self)