From 4a1e5aa69ed38213ad9422c00c2bc5624817d948 Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Wed, 10 Sep 2014 22:48:27 +0200
Subject: [PATCH] doc: correct gobject introspection annotations

Some annotation became deprecated and there was a missing colon in CPML.
---
 src/adg/adg-canvas.c          | 4 +---
 src/adg/adg-dash.c            | 3 +--
 src/adg/adg-introspection.h   | 2 +-
 src/adg/adg-path.c            | 3 +--
 src/cpml/cpml-introspection.h | 2 +-
 src/cpml/cpml-primitive.c     | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/adg/adg-canvas.c b/src/adg/adg-canvas.c
index 4906f712..b0d04db3 100644
--- a/src/adg/adg-canvas.c
+++ b/src/adg/adg-canvas.c
@@ -573,14 +573,12 @@ adg_canvas_set_scales_valist(AdgCanvas *canvas, va_list var_args)
 }
 
 /**
- * adg_canvas_set_scales_array:
+ * adg_canvas_set_scales_array: (rename-to adg_canvas_set_scales)
  * @canvas:                                         an #AdgCanvas
  * @scales: (array zero-terminated=1) (allow-none): <constant>NULL</constant> terminated array of scales
  *
  * Array variant of adg_canvas_set_scales().
  *
- * Rename to: adg_canvas_set_scales
- *
  * Since: 1.0
  **/
 void
diff --git a/src/adg/adg-dash.c b/src/adg/adg-dash.c
index 07124107..e95da5fe 100644
--- a/src/adg/adg-dash.c
+++ b/src/adg/adg-dash.c
@@ -208,14 +208,13 @@ adg_dash_append_dashes_valist(AdgDash *dash, gint num_dashes, va_list var_args)
 }
 
 /**
- * adg_dash_append_dashes_array:
+ * adg_dash_append_dashes_array: (rename-to adg_dash_append_dashes)
  * @dash: an #AdgDash instance
  * @num_dashes: number of dashes to append
  * @dashes: (array length=num_dashes): array of @num_dashes gdoubles
  *
  * Array version of adg_dash_append_dashes().
  *
- * Rename to: adg_dash_append_dashes
  * Since: 1.0
  **/
 void
diff --git a/src/adg/adg-introspection.h b/src/adg/adg-introspection.h
index f89d8b41..f1082e18 100644
--- a/src/adg/adg-introspection.h
+++ b/src/adg/adg-introspection.h
@@ -18,7 +18,7 @@
  */
 
 
-#if !defined(__GI_SCANNER__)
+#ifndef __GI_SCANNER__
 #error "adg-introspection.h must be included by g-ir-scanner only."
 #endif
 
diff --git a/src/adg/adg-path.c b/src/adg/adg-path.c
index ec1aae7d..c5a68467 100644
--- a/src/adg/adg-path.c
+++ b/src/adg/adg-path.c
@@ -365,7 +365,7 @@ adg_path_append_valist(AdgPath *path, CpmlPrimitiveType type, va_list var_args)
 }
 
 /**
- * adg_path_append_array:
+ * adg_path_append_array: (rename-to adg_path_append)
  * @path:  an #AdgPath
  * @type:  a #cairo_data_type_t value
  * @pairs: (array zero-terminated=1) (element-type Cpml.Pair) (transfer none): point data, specified as a <constant>NULL</constant> terminated array of #CpmlPair pointers.
@@ -379,7 +379,6 @@ adg_path_append_valist(AdgPath *path, CpmlPrimitiveType type, va_list var_args)
  * in a primitive element more data pairs than requested, something impossible
  * to do with adg_path_append() and adg_path_append_valist().
  *
- * Rename to: adg_path_append
  * Since: 1.0
  **/
 void
diff --git a/src/cpml/cpml-introspection.h b/src/cpml/cpml-introspection.h
index f33f0f92..e5ef5aac 100644
--- a/src/cpml/cpml-introspection.h
+++ b/src/cpml/cpml-introspection.h
@@ -18,7 +18,7 @@
  */
 
 
-#if !defined(__GI_SCANNER__)
+#ifndef __GI_SCANNER__
 #error "cpml-introspection.h must be included by g-ir-scanner only."
 #endif
 
diff --git a/src/cpml/cpml-primitive.c b/src/cpml/cpml-primitive.c
index 2e3b0e46..e294b07b 100644
--- a/src/cpml/cpml-primitive.c
+++ b/src/cpml/cpml-primitive.c
@@ -454,7 +454,7 @@ cpml_primitive_get_closest_pos(const CpmlPrimitive *primitive,
 /**
  * cpml_primitive_put_intersections:
  * @primitive:                                                       the first #CpmlPrimitive
- * @primitive2: (allow-none)                                         the second #CpmlPrimitive
+ * @primitive2: (allow-none):                                        the second #CpmlPrimitive
  * @n_dest:                                                          maximum number of intersections to return
  * @dest: (out caller-allocates) (array length=n_dest) (allow-none): the destination buffer that can contain @n_dest #CpmlPair
  *
-- 
2.11.4.GIT