[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_window_group_get_current_device_grab gtk_binding_set_find gtk_check_



commit cb9ad9a1f19de9c90b02903e847dc473a0c254b4
Author: Alberto Ruiz <aruiz gnome org>
Date:   Sun Dec 13 03:58:41 2015 +0000

    nullable annotations:
      gtk_window_group_get_current_device_grab
      gtk_binding_set_find
      gtk_check_version
      gtk_drag_get_source_widget
      gtk_get_current_event
      gtk_get_current_event_device
      gtk_get_event_widge
      gtk_grab_get_current
      gtk_test_find_widget

 gtk/gtkbindings.c    |    2 +-
 gtk/gtkdnd.c         |    2 +-
 gtk/gtkmain.c        |   10 +++++-----
 gtk/gtktestutils.c   |    2 +-
 gtk/gtkwindowgroup.c |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index 6218043..9ee4634 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -751,7 +751,7 @@ gtk_binding_set_find_interned (const gchar *set_name)
  * The @set_name can either be a name used for gtk_binding_set_new()
  * or the type name of a class used in gtk_binding_set_by_class().
  *
- * Returns: (transfer none): %NULL or the specified binding set
+ * Returns: (nullable) (transfer none): %NULL or the specified binding set
  */
 GtkBindingSet*
 gtk_binding_set_find (const gchar *set_name)
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 2978568..ba0ff76 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1058,7 +1058,7 @@ gtk_drag_get_data (GtkWidget      *widget,
  *
  * Determines the source widget for a drag.
  *
- * Returns: (transfer none): if the drag is occurring
+ * Returns: (nullable) (transfer none): if the drag is occurring
  *     within a single application, a pointer to the source widget.
  *     Otherwise, %NULL.
  */
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 25fef1c..909e9ef 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -312,7 +312,7 @@ gtk_get_interface_age (void)
  * old version of gtk_check_version(), but still get loaded
  * into an application using a newer version of GTK+.
  *
- * Returns: %NULL if the GTK+ library is compatible with the
+ * Returns: (nullable): %NULL if the GTK+ library is compatible with the
  *   given version, or a string describing the version mismatch.
  *   The returned string is owned by GTK+ and should not be modified
  *   or freed.
@@ -2159,7 +2159,7 @@ gtk_grab_add (GtkWidget *widget)
  *
  * Queries the current grab of the default window group.
  *
- * Returns: (transfer none): The widget which currently
+ * Returns: (nullable) (transfer none): The widget which currently
  *     has the grab or %NULL if no grab is active
  */
 GtkWidget*
@@ -2361,7 +2361,7 @@ gtk_invoke_key_snoopers (GtkWidget *grab_widget,
  * the current event will be the #GdkEventButton that triggered
  * the ::clicked signal.
  *
- * Returns: (transfer full): a copy of the current event, or
+ * Returns: (nullable) (transfer full): a copy of the current event, or
  *     %NULL if there is no current event. The returned event must be
  *     freed with gdk_event_free().
  */
@@ -2423,7 +2423,7 @@ gtk_get_current_event_state (GdkModifierType *state)
  * If there is a current event and it has a device, return that
  * device, otherwise return %NULL.
  *
- * Returns: (transfer none): a #GdkDevice, or %NULL
+ * Returns: (nullable) (transfer none): a #GdkDevice, or %NULL
  */
 GdkDevice *
 gtk_get_current_event_device (void)
@@ -2442,7 +2442,7 @@ gtk_get_current_event_device (void)
  * returns %NULL, otherwise returns the widget that received the event
  * originally.
  *
- * Returns: (transfer none): the widget that originally
+ * Returns: (nullable) (transfer none): the widget that originally
  *     received @event, or %NULL
  */
 GtkWidget*
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 78bb258..8301cda 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -435,7 +435,7 @@ gtk_test_find_sibling (GtkWidget *base_widget,
  * gtk_test_widget_click() for possible caveats involving the search of
  * such widgets and synthesizing widget events.
  *
- * Returns: (transfer none): a valid widget if any is found or %NULL.
+ * Returns: (nullable) (transfer none): a valid widget if any is found or %NULL.
  *
  * Since: 2.14
  **/
diff --git a/gtk/gtkwindowgroup.c b/gtk/gtkwindowgroup.c
index bed78cf..bb12650 100644
--- a/gtk/gtkwindowgroup.c
+++ b/gtk/gtkwindowgroup.c
@@ -337,7 +337,7 @@ _gtk_window_group_remove_device_grab (GtkWindowGroup *window_group,
  *
  * Returns the current grab widget for @device, or %NULL if none.
  *
- * Returns: (transfer none): The grab widget, or %NULL
+ * Returns: (nullable) (transfer none): The grab widget, or %NULL
  *
  * Since: 3.0
  */


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