[librsvg] introspection: assorted fixes to avoid Vala regressions

[Evan Nemerson <evann src gnome org>]

commit f8e7e259a7d617a4d9244ee0183ca1dc1dbfb5a4
Author: Evan Nemerson <evan coeus-group com>
Date:   Sun Jun 10 18:28:34 2012 -0700

    introspection: assorted fixes to avoid Vala regressions
    
    https://bugzilla.gnome.org/show_bug.cgi?id=677674

 Makefile.am    |    1 +
 rsvg-base.c    |   16 ++++++++--------
 rsvg-gobject.c |   21 +++++++++++++++++++++
 rsvg.c         |    2 +-
 rsvg.h         |    2 ++
 5 files changed, 33 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2f7ae36..c97a07e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -238,6 +238,7 @@ Rsvg_ RSVG_API_VERSION_U@_gir_PACKAGES = \
 	$(NULL)
 Rsvg_ RSVG_API_VERSION_U@_gir_CFLAGS = -I$(top_builddir) -DRSVG_COMPILATION
 Rsvg_ RSVG_API_VERSION_U@_gir_LIBS = librsvg- RSVG_API_MAJOR_VERSION@.la
+Rsvg_ RSVG_API_VERSION_U@_gir_SCANNERFLAGS = --c-include="librsvg/rsvg.h"
 
 girdir = $(datadir)/gir-1.0
 nodist_gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/rsvg-base.c b/rsvg-base.c
index 0220055..5696e1c 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -1022,7 +1022,7 @@ rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri)
 /**
  * rsvg_handle_set_base_gfile:
  * @handle: a #RsvgHandle
- * @file: a #GFile
+ * @base_file: a #GFile
  *
  * Set the base URI for @handle from @file.
  * Note: This function may only be called before rsvg_handle_write()
@@ -1295,7 +1295,7 @@ rsvg_handle_get_dimensions (RsvgHandle * handle, RsvgDimensionData * dimension_d
 /**
  * rsvg_handle_get_dimensions_sub
  * @handle: A #RsvgHandle
- * @dimension_data: A place to store the SVG's size
+ * @dimension_data: (out): A place to store the SVG's size
  * @id: An element's id within the SVG, or NULL to get the dimension of the whole SVG. 
  * For example, if you have a layer called "layer1" for that you want to get the dimension, 
  * pass "#layer1" as the id.
@@ -1404,7 +1404,7 @@ rsvg_handle_get_dimensions_sub (RsvgHandle * handle, RsvgDimensionData * dimensi
 /**
  * rsvg_handle_get_position_sub
  * @handle: A #RsvgHandle
- * @position_data: A place to store the SVG fragment's position.
+ * @position_data: (out): A place to store the SVG fragment's position.
  * @id: An element's id within the SVG.
  * For example, if you have a layer called "layer1" for that you want to get
  * the position, pass "#layer1" as the id.
@@ -1639,7 +1639,7 @@ rsvg_handle_set_size_callback (RsvgHandle * handle,
 /**
  * rsvg_handle_write:
  * @handle: an #RsvgHandle
- * @buf: (array length=count) (element-type uint8): pointer to svg data
+ * @buf: (array length=count) (element-type guint8): pointer to svg data
  * @count: length of the @buf buffer in bytes
  * @error: (allow-none): a location to store a #GError, or %NULL
  *
@@ -1862,7 +1862,7 @@ rsvg_handle_new_from_gfile_sync (GFile          *file,
 
 /**
  * rsvg_handle_new_from_stream_sync:
- * @stream: a #GInputStream
+ * @input_stream: a #GInputStream
  * @base_file: (allow-none): a #GFile, or %NULL
  * @flags: flags from #RsvgHandleFlags
  * @cancellable: (allow-none): a #GCancellable, or %NULL
@@ -1880,7 +1880,7 @@ rsvg_handle_new_from_gfile_sync (GFile          *file,
  * Since: 2.32
  */
 RsvgHandle *
-rsvg_handle_new_from_stream_sync (GInputStream   *stream,
+rsvg_handle_new_from_stream_sync (GInputStream   *input_stream,
                                   GFile          *base_file,
                                   RsvgHandleFlags flags,
                                   GCancellable    *cancellable,
@@ -1888,7 +1888,7 @@ rsvg_handle_new_from_stream_sync (GInputStream   *stream,
 {
     RsvgHandle *handle;
 
-    g_return_val_if_fail (G_IS_INPUT_STREAM (stream), NULL);
+    g_return_val_if_fail (G_IS_INPUT_STREAM (input_stream), NULL);
     g_return_val_if_fail (base_file == NULL || G_IS_FILE (base_file), NULL);
     g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
     g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -1898,7 +1898,7 @@ rsvg_handle_new_from_stream_sync (GInputStream   *stream,
     if (base_file)
         rsvg_handle_set_base_gfile (handle, base_file);
 
-    if (!rsvg_handle_read_stream_sync (handle, stream, cancellable, error)) {
+    if (!rsvg_handle_read_stream_sync (handle, input_stream, cancellable, error)) {
         g_object_unref (handle);
         return NULL;
     }
diff --git a/rsvg-gobject.c b/rsvg-gobject.c
index 48ad928..07ad0cd 100644
--- a/rsvg-gobject.c
+++ b/rsvg-gobject.c
@@ -282,18 +282,39 @@ rsvg_handle_class_init (RsvgHandleClass * klass)
                                                           _("ex"), 0, G_MAXDOUBLE, 0,
                                                           (GParamFlags) (G_PARAM_READABLE)));
 
+    /**
+     * RsvgHandle:title:
+     *
+     * SVG's description
+     *
+     * Deprecated: 2.36
+     */
     g_object_class_install_property (gobject_class,
                                      PROP_TITLE,
                                      g_param_spec_string ("title", _("Title"),
                                                           _("SVG file title"), NULL,
                                                           (GParamFlags) (G_PARAM_READABLE)));
 
+    /**
+     * RsvgHandle:desc:
+     *
+     * SVG's description
+     *
+     * Deprecated: 2.36
+     */
     g_object_class_install_property (gobject_class,
                                      PROP_DESC,
                                      g_param_spec_string ("desc", _("Description"),
                                                           _("SVG file description"), NULL,
                                                           (GParamFlags) (G_PARAM_READABLE)));
 
+    /**
+     * RsvgHandle:metadata:
+     *
+     * SVG's description
+     *
+     * Deprecated: 2.36
+     */
     g_object_class_install_property (gobject_class,
                                      PROP_METADATA,
                                      g_param_spec_string ("metadata", _("Metadata"),
diff --git a/rsvg.c b/rsvg.c
index 9ee56fa..cbe4da9 100644
--- a/rsvg.c
+++ b/rsvg.c
@@ -57,7 +57,7 @@
  * will be returned.  Note that the pixbuf may not be complete until
  * @rsvg_handle_close has been called.
  *
- * Returns: the pixbuf loaded by #handle, or %NULL.
+ * Returns: (transfer full): the pixbuf loaded by #handle, or %NULL.
  *
  * Since: 2.14
  **/
diff --git a/rsvg.h b/rsvg.h
index c8968db..10fb24f 100644
--- a/rsvg.h
+++ b/rsvg.h
@@ -83,6 +83,8 @@ struct _RsvgHandleClass {
 struct _RsvgHandle {
     GObject parent;
 
+    /*< private >*/
+
     RsvgHandlePrivate *priv;
 
     gpointer _abi_padding[15];