summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2018-03-18 21:47:10 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2018-03-18 21:47:10 +0100
commit158df3c1bb0b67f6b00f9270715277070f58cab5 (patch)
tree708c1c017031eb127a0286b93c1c5f8d400a67e8
parentf1e1e9a71e58d34a71b40ac6a11a90ce1a5398e4 (diff)
downloadgtk+-158df3c1bb0b67f6b00f9270715277070f58cab5.tar.gz
gtk: Fix some g-i annotations warnings
-rw-r--r--gtk/gtkmediacontrols.c2
-rw-r--r--gtk/gtkmediafile.c4
-rw-r--r--gtk/gtkmediastream.c2
-rw-r--r--gtk/gtkvideo.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkmediacontrols.c b/gtk/gtkmediacontrols.c
index 1f299bd2f2..a55475e662 100644
--- a/gtk/gtkmediacontrols.c
+++ b/gtk/gtkmediacontrols.c
@@ -320,7 +320,7 @@ gtk_media_controls_new (GtkMediaStream *stream)
*
* Gets the media stream managed by @controls or %NULL if none.
*
- * Returns: (nullable): The media stream managed by @controls
+ * Returns: (nullable) (transfer none): The media stream managed by @controls
**/
GtkMediaStream *
gtk_media_controls_get_media_stream (GtkMediaControls *controls)
diff --git a/gtk/gtkmediafile.c b/gtk/gtkmediafile.c
index e3b0e62756..7c3f30f929 100644
--- a/gtk/gtkmediafile.c
+++ b/gtk/gtkmediafile.c
@@ -511,7 +511,7 @@ gtk_media_file_set_file (GtkMediaFile *self,
* When @self is not playing or not playing from a file,
* %NULL is returned.
*
- * Returns: (nullable): The currently playing file or %NULL if not
+ * Returns: (nullable) (transfer none): The currently playing file or %NULL if not
* playing from a file.
**/
GFile *
@@ -571,7 +571,7 @@ gtk_media_file_set_input_stream (GtkMediaFile *self,
* When @self is not playing or not playing from a stream,
* %NULL is returned.
*
- * Returns: (nullable): The currently playing stream or %NULL if not
+ * Returns: (nullable) (transfer none): The currently playing stream or %NULL if not
* playing from a stream.
**/
GInputStream *
diff --git a/gtk/gtkmediastream.c b/gtk/gtkmediastream.c
index 0688ed199c..6c03939ab6 100644
--- a/gtk/gtkmediastream.c
+++ b/gtk/gtkmediastream.c
@@ -1108,7 +1108,7 @@ gtk_media_stream_error (GtkMediaStream *self,
}
/**
- * gtk_media_stream_error:
+ * gtk_media_stream_error_valist:
* @self: a #GtkMediaStream
* @domain: error domain
* @code: error code
diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c
index 755acdde98..b6c1edd690 100644
--- a/gtk/gtkvideo.c
+++ b/gtk/gtkvideo.c
@@ -366,7 +366,7 @@ gtk_video_new_for_filename (const char *filename)
/**
* gtk_video_new_for_resource:
- * @filename: (allow-none): resource path to play back
+ * @resource_path: (allow-none): resource path to play back
*
* Creates a #GtkVideo to play back the resource at the
* given @resource_path.
@@ -412,7 +412,7 @@ gtk_video_new_for_resource (const char *resource_path)
*
* Gets the media stream managed by @self or %NULL if none.
*
- * Returns: (nullable): The media stream managed by @self
+ * Returns: (nullable) (transfer none): The media stream managed by @self
**/
GtkMediaStream *
gtk_video_get_media_stream (GtkVideo *self)
@@ -582,7 +582,7 @@ gtk_video_set_file (GtkVideo *self,
}
/**
- * gtk_video_set_resource:
+ * gtk_video_set_filename:
* @self: a #GtkVideo
* @filename: (allow-none): the filename to play
*