summaryrefslogtreecommitdiff
path: root/gtk/gtkclipboard.c
diff options
context:
space:
mode:
authorEvan Nemerson <evan@nemerson.com>2014-05-26 09:13:02 -0700
committerEvan Nemerson <evan@nemerson.com>2014-05-30 13:24:20 -0700
commit54ec42f035d7b3d47968eecce30659a23e7b3e48 (patch)
tree71f244ce8d41bf0f71626d204b24c53f8e596f0b /gtk/gtkclipboard.c
parent4d1930cf74e99e346ec1b2bd31421e863e271358 (diff)
downloadgtk+-54ec42f035d7b3d47968eecce30659a23e7b3e48.tar.gz
gtk: port many nullability annotation fixes from Vala bindings
https://bugzilla.gnome.org/show_bug.cgi?id=730745
Diffstat (limited to 'gtk/gtkclipboard.c')
-rw-r--r--gtk/gtkclipboard.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index b867a3fbe9..682634695e 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1385,7 +1385,7 @@ clipboard_received_func (GtkClipboard *clipboard,
* This function waits for the data to be received using the main
* loop, so events, timeouts, etc, may be dispatched during the wait.
*
- * Returns: a newly-allocated #GtkSelectionData object or %NULL
+ * Returns: (nullable): a newly-allocated #GtkSelectionData object or %NULL
* if retrieving the given target failed. If non-%NULL,
* this value must be freed with gtk_selection_data_free()
* when you are finished with it.
@@ -1438,7 +1438,7 @@ clipboard_text_received_func (GtkClipboard *clipboard,
* the data to be received using the main loop, so events,
* timeouts, etc, may be dispatched during the wait.
*
- * Returns: a newly-allocated UTF-8 string which must
+ * Returns: (nullable): a newly-allocated UTF-8 string which must
* be freed with g_free(), or %NULL if retrieving
* the selection data failed. (This could happen
* for various reasons, in particular if the
@@ -1497,7 +1497,7 @@ clipboard_rich_text_received_func (GtkClipboard *clipboard,
* waits for the data to be received using the main loop, so events,
* timeouts, etc, may be dispatched during the wait.
*
- * Returns: (array length=length) (transfer full): a
+ * Returns: (nullable) (array length=length) (transfer full): a
* newly-allocated binary block of data which must be
* freed with g_free(), or %NULL if retrieving the
* selection data failed. (This could happen for various
@@ -1564,7 +1564,7 @@ clipboard_image_received_func (GtkClipboard *clipboard,
* the data to be received using the main loop, so events,
* timeouts, etc, may be dispatched during the wait.
*
- * Returns: (transfer full): a newly-allocated #GdkPixbuf
+ * Returns: (nullable) (transfer full): a newly-allocated #GdkPixbuf
* object which must be disposed with g_object_unref(), or
* %NULL if retrieving the selection data failed. (This could
* happen for various reasons, in particular if the clipboard
@@ -1618,13 +1618,12 @@ clipboard_uris_received_func (GtkClipboard *clipboard,
* for the data to be received using the main loop, so events,
* timeouts, etc, may be dispatched during the wait.
*
- * Returns: (array zero-terminated=1) (element-type utf8) (transfer full): a newly-allocated
- * %NULL-terminated array of strings which must
- * be freed with g_strfreev(), or %NULL if
- * retrieving the selection data failed. (This
- * could happen for various reasons, in particular
- * if the clipboard was empty or if the contents of
- * the clipboard could not be converted into URI form.)
+ * Returns: (nullable) (array zero-terminated=1) (element-type utf8) (transfer full):
+ * a newly-allocated %NULL-terminated array of strings which must
+ * be freed with g_strfreev(), or %NULL if retrieving the
+ * selection data failed. (This could happen for various reasons,
+ * in particular if the clipboard was empty or if the contents of
+ * the clipboard could not be converted into URI form.)
*
* Since: 2.14
**/