[PATCH 13/16] annotations: Removed unnecessary annotations

[Simón Pena <spenap gmail com>]

Returning "const gchar*" get annotated as (type utf8) (transfer none),
so there's no need to annotate them manually.
Besides, (allow-none) isn't needed for return values.
---
 src/data/grl-config.c      |    8 ++++----
 src/data/grl-data.c        |    2 +-
 src/data/grl-media-audio.c |    8 ++++----
 src/data/grl-media.c       |   32 ++++++++++++++++----------------
 src/grl-metadata-source.c  |    6 +++---
 src/grl-plugin-registry.c  |    2 +-
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/data/grl-config.c b/src/data/grl-config.c
index bf911fe..d963773 100644
--- a/src/data/grl-config.c
+++ b/src/data/grl-config.c
@@ -280,7 +280,7 @@ grl_config_set_api_secret (GrlConfig *config, const gchar *secret)
  * grl_config_get_plugin:
  * @config: the config instance
  *
- * Returns: (type utf8) (transfer none): the plugin id
+ * Returns: the plugin id
  */
 const gchar *
 grl_config_get_plugin (GrlConfig *config)
@@ -293,7 +293,7 @@ grl_config_get_plugin (GrlConfig *config)
  * grl_config_get_api_key:
  * @config: the config instance
  *
- * Returns: (type utf8) (transfer none): the webservice API key
+ * Returns: the webservice API key
  */
 const gchar *
 grl_config_get_api_key (GrlConfig *config)
@@ -306,7 +306,7 @@ grl_config_get_api_key (GrlConfig *config)
  * grl_config_get_api_token:
  * @config: the config instance
  *
- * Returns: (type utf8) (transfer none): the webservice API token
+ * Returns: the webservice API token
  */
 const gchar *
 grl_config_get_api_token (GrlConfig *config)
@@ -319,7 +319,7 @@ grl_config_get_api_token (GrlConfig *config)
  * grl_config_get_api_secret:
  * @config: the config instance
  *
- * Returns: (type utf8) (transfer none): the webservice API passphrase
+ * Returns: the webservice API passphrase
  */
 const gchar *
 grl_config_get_api_secret (GrlConfig *config)
diff --git a/src/data/grl-data.c b/src/data/grl-data.c
index 6a9e3e4..6ea8154 100644
--- a/src/data/grl-data.c
+++ b/src/data/grl-data.c
@@ -256,7 +256,7 @@ grl_data_set_string (GrlData *data,
  * Returns the value associated with the key. If key has no value, or value is
  * not string, or key is not in data, then NULL is returned.
  *
- * Returns: (transfer none): string associated with key, or NULL in other case. Caller should not change nor free the value.
+ * Returns: string associated with key, or NULL in other case. Caller should not change nor free the value.
  **/
 const gchar *
 grl_data_get_string (GrlData *data, GrlKeyID key)
diff --git a/src/data/grl-media-audio.c b/src/data/grl-media-audio.c
index 6568056..8c4c69d 100644
--- a/src/data/grl-media-audio.c
+++ b/src/data/grl-media-audio.c
@@ -153,7 +153,7 @@ grl_media_audio_set_bitrate (GrlMediaAudio *data, gint bitrate)
  * grl_media_audio_get_artist:
  * @data: the media instance
  *
- * Returns: (type utf8) (transfer none): the artist of the audio
+ * Returns: the artist of the audio
  */
 const gchar *
 grl_media_audio_get_artist (GrlMediaAudio *data)
@@ -165,7 +165,7 @@ grl_media_audio_get_artist (GrlMediaAudio *data)
  * grl_media_audio_get_album:
  * @data: the media instance
  *
- * Returns: (type utf8) (transfer none): the album of the audio
+ * Returns: the album of the audio
  */
 const gchar *
 grl_media_audio_get_album (GrlMediaAudio *data)
@@ -177,7 +177,7 @@ grl_media_audio_get_album (GrlMediaAudio *data)
  * grl_media_audio_get_genre:
  * @data: the media instance
  *
- * Returns: (type utf8) (transfer none): the genre of the audio
+ * Returns: the genre of the audio
  */
 const gchar *
 grl_media_audio_get_genre (GrlMediaAudio *data)
@@ -189,7 +189,7 @@ grl_media_audio_get_genre (GrlMediaAudio *data)
  * grl_media_audio_get_lyrics:
  * @data: the media instance
  *
- * Returns: (type utf8) (transfer none): the lyrics of the audio
+ * Returns: the lyrics of the audio
  */
 const gchar *
 grl_media_audio_get_lyrics (GrlMediaAudio *data)
diff --git a/src/data/grl-media.c b/src/data/grl-media.c
index 6da5ab2..fb3c085 100644
--- a/src/data/grl-media.c
+++ b/src/data/grl-media.c
@@ -649,7 +649,7 @@ grl_media_set_license (GrlMedia *data, const gchar *license)
  * grl_media_get_id:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's identifier
+ * Returns: the media's identifier
  */
 const gchar *
 grl_media_get_id (GrlMedia *data)
@@ -661,7 +661,7 @@ grl_media_get_id (GrlMedia *data)
  * grl_media_get_url:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's URL
+ * Returns: the media's URL
  */
 const gchar *
 grl_media_get_url (GrlMedia *data)
@@ -673,7 +673,7 @@ grl_media_get_url (GrlMedia *data)
  * grl_media_get_author:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's author
+ * Returns: the media's author
  */
 const gchar *
 grl_media_get_author (GrlMedia *data)
@@ -685,7 +685,7 @@ grl_media_get_author (GrlMedia *data)
  * grl_media_get_title:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's title
+ * Returns: the media's title
  */
 const gchar *
 grl_media_get_title (GrlMedia *data)
@@ -697,7 +697,7 @@ grl_media_get_title (GrlMedia *data)
  * grl_media_get_description:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's description
+ * Returns: the media's description
  */
 const gchar *
 grl_media_get_description (GrlMedia *data)
@@ -709,7 +709,7 @@ grl_media_get_description (GrlMedia *data)
  * grl_media_get_source:
  * @data: the media object source
  *
- * Returns: (type utf8) (transfer none): the media's source
+ * Returns: the media's source
  */
 const gchar *
 grl_media_get_source (GrlMedia *data)
@@ -721,7 +721,7 @@ grl_media_get_source (GrlMedia *data)
  * grl_media_get_thumbnail:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's thumbnail URL
+ * Returns: the media's thumbnail URL
  */
 const gchar *
 grl_media_get_thumbnail (GrlMedia *data)
@@ -733,7 +733,7 @@ grl_media_get_thumbnail (GrlMedia *data)
  * grl_media_get_site:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's site
+ * Returns: the media's site
  */
 const gchar *
 grl_media_get_site (GrlMedia *data)
@@ -757,7 +757,7 @@ grl_media_get_duration (GrlMedia *data)
  * grl_media_get_date:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's date (TBD)
+ * Returns: the media's date (TBD)
  */
 const gchar *
 grl_media_get_date (GrlMedia *data)
@@ -769,7 +769,7 @@ grl_media_get_date (GrlMedia *data)
  * grl_media_get_mime:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's mime-type
+ * Returns: the media's mime-type
  */
 const gchar *
 grl_media_get_mime (GrlMedia *data)
@@ -817,7 +817,7 @@ grl_media_get_last_position (GrlMedia *data)
  * grl_media_get_last_played:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's last played time
+ * Returns: the media's last played time
  */
 const gchar *
 grl_media_get_last_played (GrlMedia *data)
@@ -829,7 +829,7 @@ grl_media_get_last_played (GrlMedia *data)
  * grl_media_get_external_player:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): URL of an external player
+ * Returns: URL of an external player
  * object for this media
  */
 const gchar *
@@ -843,7 +843,7 @@ grl_media_get_player(GrlMedia *data)
  * grl_media_get_external_url:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): URL of an external location
+ * Returns: URL of an external location
  * where the user play the media.
  */
 const gchar *
@@ -856,7 +856,7 @@ grl_media_get_external_url (GrlMedia *data)
  * grl_media_get_studio:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the studio the media is from
+ * Returns: the studio the media is from
  */
 const gchar *
 grl_media_get_studio(GrlMedia *data)
@@ -868,7 +868,7 @@ grl_media_get_studio(GrlMedia *data)
  * grl_media_get_certificate:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the media's certificate
+ * Returns: the media's certificate
  */
 const gchar *
 grl_media_get_certificate (GrlMedia *data)
@@ -880,7 +880,7 @@ grl_media_get_certificate (GrlMedia *data)
  * grl_media_get_license:
  * @data: the media object
  *
- * Returns: (type utf8) (transfer none): the license the media is under
+ * Returns: the license the media is under
  */
 const gchar *
 grl_media_get_license (GrlMedia *data)
diff --git a/src/grl-metadata-source.c b/src/grl-metadata-source.c
index 32b1222..340f6b7 100644
--- a/src/grl-metadata-source.c
+++ b/src/grl-metadata-source.c
@@ -1056,7 +1056,7 @@ grl_metadata_source_setup_full_resolution_mode (GrlMetadataSource *source,
  * grl_metadata_source_get_id:
  * @source: a metadata source
  *
- * Returns: (transfer none): the ID of the @source
+ * Returns: the ID of the @source
  */
 const gchar *
 grl_metadata_source_get_id (GrlMetadataSource *source)
@@ -1070,7 +1070,7 @@ grl_metadata_source_get_id (GrlMetadataSource *source)
  * grl_metadata_source_get_name:
  * @source: a metadata source
  *
- * Returns: (transfer none): the name of the @source
+ * Returns: the name of the @source
  */
 const gchar *
 grl_metadata_source_get_name (GrlMetadataSource *source)
@@ -1084,7 +1084,7 @@ grl_metadata_source_get_name (GrlMetadataSource *source)
  * grl_metadata_source_get_description:
  * @source: a metadata source
  *
- * Returns: (transfer none): the description of the @source
+ * Returns: the description of the @source
  */
 const gchar *
 grl_metadata_source_get_description (GrlMetadataSource *source)
diff --git a/src/grl-plugin-registry.c b/src/grl-plugin-registry.c
index 98c490b..c7de80a 100644
--- a/src/grl-plugin-registry.c
+++ b/src/grl-plugin-registry.c
@@ -530,7 +530,7 @@ grl_plugin_registry_load_all (GrlPluginRegistry *registry)
  *
  * This function will search and retrieve a source given its identifier.
  *
- * Returns: (allow-none) (transfer none): The source found.
+ * Returns: (transfer none): The source found.
  */
 GrlMediaPlugin *
 grl_plugin_registry_lookup_source (GrlPluginRegistry *registry,
-- 
1.7.0.4