[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_accessible_get_widget gtk_actionable_get_action_name gtk_app_chooser



commit be31a0d33281dc618a22e3d62b7496e3bf37f94a
Author: Alberto Ruiz <aruiz gnome org>
Date:   Wed Aug 19 01:22:04 2015 +0100

    nullable annotations:
      gtk_accessible_get_widget
      gtk_actionable_get_action_name
      gtk_app_chooser_get_app_info
      gtk_app_chooser_button_get_heading
      gtk_app_chooser_dialog_get_heading
      gtk_application_get_window_by_id

 gtk/gtkaccessible.c       |    2 +-
 gtk/gtkactionable.c       |    3 ++-
 gtk/gtkappchooser.c       |    2 +-
 gtk/gtkappchooserbutton.c |    2 +-
 gtk/gtkappchooserdialog.c |    2 +-
 gtk/gtkapplication.c      |    2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index e8fe6ca..9efbb0c 100644
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -207,7 +207,7 @@ gtk_accessible_set_widget (GtkAccessible *accessible,
  * The returned widget does not have a reference added, so
  * you do not need to unref it.
  *
- * Returns: (transfer none): pointer to the #GtkWidget
+ * Returns: (nullable) (transfer none): pointer to the #GtkWidget
  *     corresponding to the #GtkAccessible, or %NULL.
  *
  * Since: 2.22
diff --git a/gtk/gtkactionable.c b/gtk/gtkactionable.c
index 5e25f41..69632dc 100644
--- a/gtk/gtkactionable.c
+++ b/gtk/gtkactionable.c
@@ -86,7 +86,7 @@ gtk_actionable_default_init (GtkActionableInterface *iface)
  *
  * See gtk_actionable_set_action_name() for more information.
  *
- * Returns: the action name, or %NULL if none is set
+ * Returns (nullable): the action name, or %NULL if none is set
  *
  * Since: 3.4
  **/
@@ -258,3 +258,4 @@ gtk_actionable_set_detailed_action_name (GtkActionable *actionable,
     gtk_actionable_set_action_target_value (actionable, NULL);
   g_strfreev (parts);
 }
+
diff --git a/gtk/gtkappchooser.c b/gtk/gtkappchooser.c
index dae884c..30c88e2 100644
--- a/gtk/gtkappchooser.c
+++ b/gtk/gtkappchooser.c
@@ -109,7 +109,7 @@ gtk_app_chooser_get_content_type (GtkAppChooser *self)
  *
  * Returns the currently selected application.
  *
- * Returns: (transfer full): a #GAppInfo for the currently selected
+ * Returns: (nullable) (transfer full): a #GAppInfo for the currently selected
  *     application, or %NULL if none is selected. Free with g_object_unref()
  *
  * Since: 3.0
diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c
index 4e084d4..658be1a 100644
--- a/gtk/gtkappchooserbutton.c
+++ b/gtk/gtkappchooserbutton.c
@@ -971,7 +971,7 @@ gtk_app_chooser_button_set_heading (GtkAppChooserButton *self,
  *
  * Returns the text to display at the top of the dialog.
  *
- * Returns: the text to display at the top of the dialog,
+ * Returns (nullable): the text to display at the top of the dialog,
  *     or %NULL, in which case a default text is displayed
  */
 const gchar *
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index c582063..ad7de8e 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -863,7 +863,7 @@ gtk_app_chooser_dialog_set_heading (GtkAppChooserDialog *self,
  *
  * Returns the text to display at the top of the dialog.
  *
- * Returns: the text to display at the top of the dialog, or %NULL, in which
+ * Returns (nullable): the text to display at the top of the dialog, or %NULL, in which
  *     case a default text is displayed
  */
 const gchar *
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index f863533..8f16ec8 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -1096,7 +1096,7 @@ gtk_application_get_windows (GtkApplication *application)
  *
  * Returns the #GtkApplicationWindow with the given ID.
  *
- * Returns: (transfer none): the window with ID @id, or
+ * Returns: (nullable) (transfer none): the window with ID @id, or
  *   %NULL if there is no window with this ID
  *
  * Since: 3.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]