[libchamplain] Eliminate warnings of g-ir-scanner

[Jiří Techet <jiritechet src gnome org>]

commit 52ac4ecedca949b62971f9b43236584b5ce6cd9f
Author: JiÅ?í Techet <techet gmail com>
Date:   Thu Dec 30 22:31:16 2010 +0100

    Eliminate warnings of g-ir-scanner

 champlain-gtk/gtk-champlain-embed.c      |    2 +-
 champlain/Makefile.am                    |    5 +++--
 champlain/champlain-map-source-factory.c |   12 ++++++------
 champlain/champlain-map-source.c         |    4 ++--
 champlain/champlain-marker.c             |    2 +-
 champlain/champlain-polygon.c            |    2 +-
 champlain/champlain-selection-layer.c    |    2 +-
 champlain/champlain-tile-source.c        |    2 +-
 champlain/champlain-tile.c               |    2 +-
 champlain/champlain-view.c               |    2 +-
 10 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/champlain-gtk/gtk-champlain-embed.c b/champlain-gtk/gtk-champlain-embed.c
index 4d44af4..703443e 100644
--- a/champlain-gtk/gtk-champlain-embed.c
+++ b/champlain-gtk/gtk-champlain-embed.c
@@ -339,7 +339,7 @@ gtk_champlain_embed_new ()
  *
  * Gets a #ChamplainView from the #GtkChamplainEmbed object.
  *
- * Return value: a #ChamplainView ready to be used
+ * Return value: (transfer none): a #ChamplainView ready to be used
  *
  * Since: 0.4
  */
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 8858d3a..66a1642 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -146,8 +146,9 @@ if HAVE_INTROSPECTION
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --warn-all
 INTROSPECTION_COMPILER_ARGS =
-introspection_sources = $(libchamplain_ CHAMPLAIN_API_VERSION@_la_SOURCES)
-
+introspection_sources = \
+	$(libchamplain_headers_public)	\
+	$(libchamplain_sources)
 if ENABLE_MEMPHIS
 memphis_gir_include = Memphis-0.2
 endif
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index f4e57e8..6aed3ae 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -319,7 +319,7 @@ champlain_map_source_factory_init (ChamplainMapSourceFactory *factory)
  *
  * A method to obtain the singleton object.
  *
- * Returns: the singleton #ChamplainMapSourceFactory, it should be freed
+ * Returns: (transfer full): the singleton #ChamplainMapSourceFactory, it should be freed
  * using #g_object_unref when not needed.
  *
  * Since: 0.4
@@ -337,7 +337,7 @@ champlain_map_source_factory_dup_default (void)
  *
  * Get the list of registered map sources.
  *
- * Returns: the list of registered map sources, the items should not be freed,
+ * Returns: (transfer container): the list of registered map sources, the items should not be freed,
  * the list should be freed with #g_slist_free.
  *
  * Since: 0.4
@@ -357,7 +357,7 @@ champlain_map_source_factory_dup_list (ChamplainMapSourceFactory *factory)
  * The id should not contain any character that can't be in a filename as it
  * will be used as the cache directory name for that map source.
  *
- * Returns: a ready to use #ChamplainMapSource matching the given name, returns
+ * Returns: (transfer full): a ready to use #ChamplainMapSource matching the given name, returns
  * NULL is none match.
  *
  * Since: 0.4
@@ -389,7 +389,7 @@ champlain_map_source_factory_create (ChamplainMapSourceFactory *factory,
  *
  * Creates a cached map source.
  *
- * Returns: a ready to use #ChamplainMapSourceChain consisting of
+ * Returns: (transfer full): a ready to use #ChamplainMapSourceChain consisting of
  * #ChamplainMemoryCache, #ChamplainFileCache, #ChamplainMapSource matching the given name, and
  * an error tile source created with champlain_map_source_factory_create_error_source ().
  *
@@ -435,7 +435,7 @@ champlain_map_source_factory_create_cached_source (ChamplainMapSourceFactory *fa
  *
  * Creates a map source generating error tiles.
  *
- * Returns: a ready to use map source generating error tiles.
+ * Returns: (transfer full): a ready to use map source generating error tiles.
  *
  * Since: 0.8
  */
@@ -457,7 +457,7 @@ champlain_map_source_factory_create_error_source (ChamplainMapSourceFactory *fac
  * champlain_map_source_factory_register:
  * @factory: A #ChamplainMapSourceFactory
  * @desc: the description of the map source
- * @constructor: the new map source constructor function
+ * @constructor: (scope notified): the new map source constructor function
  * @data: data to be passed to the constructor function, or NULL
  *
  * Registers the new map source with the given constructor.  When this map
diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c
index 45912b2..f5400ce 100644
--- a/champlain/champlain-map-source.c
+++ b/champlain/champlain-map-source.c
@@ -234,7 +234,7 @@ champlain_map_source_init (ChamplainMapSource *map_source)
  *
  * Get the next source in the chain.
  *
- * Returns: the next source in the chain.
+ * Returns: (transfer none): the next source in the chain.
  *
  * Since: 0.6
  */
@@ -253,7 +253,7 @@ champlain_map_source_get_next_source (ChamplainMapSource *map_source)
  *
  * Get the renderer used for tiles rendering.
  *
- * Returns: the renderer.
+ * Returns: (transfer none): the renderer.
  *
  * Since: 0.8
  */
diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c
index 3d68e43..80f56f2 100644
--- a/champlain/champlain-marker.c
+++ b/champlain/champlain-marker.c
@@ -1336,7 +1336,7 @@ champlain_marker_set_draw_background (ChamplainMarker *marker,
  *
  * Get the marker's image.
  *
- * Returns: the marker's image.
+ * Returns: (transfer none): the marker's image.
  *
  * Since: 0.4
  */
diff --git a/champlain/champlain-polygon.c b/champlain/champlain-polygon.c
index 9bc7ad2..ef420d8 100644
--- a/champlain/champlain-polygon.c
+++ b/champlain/champlain-polygon.c
@@ -476,7 +476,7 @@ champlain_polygon_clear_points (ChamplainPolygon *polygon)
  *
  * Gets a list of polygon points.
  *
- * Returns: a list of all points from the polygon, it shouldn't be freed.
+ * Returns: (transfer none): a list of all points from the polygon, it shouldn't be freed.
  *
  * Since: 0.4
  */
diff --git a/champlain/champlain-selection-layer.c b/champlain/champlain-selection-layer.c
index 67f7f4c..b4d9531 100644
--- a/champlain/champlain-selection-layer.c
+++ b/champlain/champlain-selection-layer.c
@@ -302,7 +302,7 @@ champlain_selection_layer_new ()
  *
  * This function will return NULL if in CHAMPLAIN_SELETION_MULTIPLE.
  *
- * Returns: the selected #ChamplainBaseMarker or NULL if none is selected.
+ * Returns: (transfer none): the selected #ChamplainBaseMarker or NULL if none is selected.
  *
  * Since: 0.4
  */
diff --git a/champlain/champlain-tile-source.c b/champlain/champlain-tile-source.c
index ab1630e..3649179 100644
--- a/champlain/champlain-tile-source.c
+++ b/champlain/champlain-tile-source.c
@@ -403,7 +403,7 @@ champlain_tile_source_init (ChamplainTileSource *tile_source)
  *
  * Gets the cache used for storing tiles by this tile source.
  *
- * Returns: the cache
+ * Returns: (transfer none): the cache
  *
  * Since: 0.6
  */
diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
index c2eba69..395da01 100644
--- a/champlain/champlain-tile.c
+++ b/champlain/champlain-tile.c
@@ -927,7 +927,7 @@ champlain_tile_display_content (ChamplainTile *self)
  *
  * Gets the tile's content actor.
  *
- * Returns: the tile's content, this actor will change each time the tile's content changes.
+ * Returns: (transfer none): the tile's content, this actor will change each time the tile's content changes.
  * You should not unref this content, it is owned by the tile.
  *
  * Since: 0.4
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index fb44df0..6d4a727 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -3263,7 +3263,7 @@ champlain_view_get_max_zoom_level (ChamplainView *view)
  *
  * Gets the view's current map source.
  *
- * Returns: the view's current map source. If you need to keep a reference to the
+ * Returns: (transfer none): the view's current map source. If you need to keep a reference to the
  * map source then you have to call #g_object_ref.
  *
  * Since: 0.4