Merge branch 'nullables-1' into 'master'

Fix some nullable return annotations

See merge request GNOME/gtk!2873
This commit is contained in:
Emmanuele Bassi 2020-11-21 16:11:34 +00:00
commit 0abc7a3361
6 changed files with 7 additions and 7 deletions

View File

@ -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 *

View File

@ -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)

View File

@ -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)

View File

@ -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 *

View File

@ -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 *

View File

@ -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)