Commit 5e786462 authored by Timm Bäder's avatar Timm Bäder 👎

Merge branch 'more-nullable-gtk3' into 'gtk-3-24'

g-i: Add some nullable annotations

See merge request GNOME/gtk!420
parents 446cb9a2 31b810ab
......@@ -441,7 +441,7 @@ update_cursor (gpointer data,
/**
* gdk_x11_display_set_cursor_theme:
* @display: (type GdkX11Display): a #GdkDisplay
* @theme: the name of the cursor theme to use, or %NULL to unset
* @theme: (nullable): the name of the cursor theme to use, or %NULL to unset
* a previously set value
* @size: the cursor size to use, or 0 to keep the previous size
*
......
......@@ -3006,8 +3006,8 @@ gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display)
/**
* gdk_x11_set_sm_client_id:
* @sm_client_id: the client id assigned by the session manager when the
* connection was opened, or %NULL to remove the property.
* @sm_client_id: (nullable): the client id assigned by the session manager
* when the connection was opened, or %NULL to remove the property.
*
* Sets the `SM_CLIENT_ID` property on the application’s leader window so that
* the window manager can save the application’s state using the X11R6 ICCCM
......
......@@ -152,7 +152,7 @@ gtk_actionable_get_action_target_value (GtkActionable *actionable)
/**
* gtk_actionable_set_action_target_value:
* @actionable: a #GtkActionable widget
* @target_value: a #GVariant to set as the target value, or %NULL
* @target_value: (nullable): a #GVariant to set as the target value, or %NULL
*
* Sets the target value of an actionable widget.
*
......
......@@ -796,7 +796,7 @@ enum_to_string (GType type,
* gtk_page_setup_to_key_file:
* @setup: a #GtkPageSetup
* @key_file: the #GKeyFile to save the page setup to
* @group_name: the group to add the settings to in @key_file,
* @group_name: (nullable): the group to add the settings to in @key_file,
* or %NULL to use the default name “Page Setup”
*
* This function adds the page setup from @setup to @key_file.
......
......@@ -949,7 +949,7 @@ gtk_paper_size_get_default_right_margin (GtkPaperSize *size,
/**
* gtk_paper_size_new_from_key_file:
* @key_file: the #GKeyFile to retrieve the papersize from
* @group_name: the name ofthe group in the key file to read,
* @group_name: (nullable): the name of the group in the key file to read,
* or %NULL to read the first group
* @error: (allow-none): return location for an error, or %NULL
*
......
......@@ -1914,7 +1914,7 @@ add_value_to_key_file (const gchar *key,
* gtk_print_settings_to_key_file:
* @settings: a #GtkPrintSettings
* @key_file: the #GKeyFile to save the print settings to
* @group_name: the group to add the settings to in @key_file, or
* @group_name: (nullable): the group to add the settings to in @key_file, or
* %NULL to use the default “Print Settings”
*
* This function adds the print settings from @settings to @key_file.
......
......@@ -376,7 +376,7 @@ gtk_tree_selection_get_mode (GtkTreeSelection *selection)
/**
* gtk_tree_selection_set_select_function:
* @selection: A #GtkTreeSelection.
* @func: The selection function. May be %NULL
* @func: (nullable): The selection function. May be %NULL
* @data: The selection function’s data. May be %NULL
* @destroy: The destroy function for user data. May be %NULL
*
......
......@@ -12419,7 +12419,7 @@ gtk_tree_view_move_column_after (GtkTreeView *tree_view,
/**
* gtk_tree_view_set_expander_column:
* @tree_view: A #GtkTreeView
* @column: %NULL, or the column to draw the expander arrow at.
* @column: (nullable): %NULL, or the column to draw the expander arrow at.
*
* Sets the column to draw the expander arrow at. It must be in @tree_view.
* If @column is %NULL, then the expander arrow is always at the first
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment