[gtk/gtk-3-24: 1/2] g-i: Add some nullable annotations
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24: 1/2] g-i: Add some nullable annotations
- Date: Mon, 19 Nov 2018 07:41:04 +0000 (UTC)
commit 31b810abca06b01727e5aaf1f6bde37172af96da
Author: Christoph Reiter <creiter src gnome org>
Date: Sun Nov 18 13:36:50 2018 +0100
g-i: Add some nullable annotations
Based on grepping arg docs for NULL.
See https://gitlab.gnome.org/GNOME/pygobject/issues/261
gdk/x11/gdkcursor-x11.c | 2 +-
gdk/x11/gdkdisplay-x11.c | 4 ++--
gtk/gtkactionable.c | 2 +-
gtk/gtkpagesetup.c | 2 +-
gtk/gtkpapersize.c | 2 +-
gtk/gtkprintsettings.c | 2 +-
gtk/gtktreeselection.c | 2 +-
gtk/gtktreeview.c | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index e7ca3f1412..5555ea01b2 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -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
*
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 659b9fa380..cb09468cca 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -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
diff --git a/gtk/gtkactionable.c b/gtk/gtkactionable.c
index 74787cfbc7..5bf224b908 100644
--- a/gtk/gtkactionable.c
+++ b/gtk/gtkactionable.c
@@ -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.
*
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index e1cbeb8573..4971a78786 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -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.
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index c293ba2806..8065edfa9a 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -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
*
diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c
index 63e8da9e60..c6f33c41d1 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -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.
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index 7150d1d301..4da15db573 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -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
*
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 44ae4fad91..97442c7fba 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]