Version bump and doc updates

diff --git a/champlain/champlainlayer.c b/champlain/champlainlayer.c
index e9ecbf0422a33f51df42dfdcfaf058b3938c73e2..8335d3519d57c57855a867afaf007b0a56e127dc 100644 (file)
--- a/champlain/champlainlayer.c
+++ b/champlain/champlainlayer.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 
+#include "champlainlayer.h"
 #include "champlain_defines.h"
 
 #include <clutter/clutter.h>
@@ -67,11 +68,11 @@ layer_add_cb (ClutterGroup *layer, ClutterActor *marker, gpointer data)
 /**
  * champlain_layer_new:
  *
- * Returns a new #ClutterActor ready to be used as a #ClutterContainer for the markers.
+ * Returns a new #ChamplainLayer ready to be used as a #ClutterContainer for the markers.
  *
  * Since: 0.2.2
  */
-ClutterActor *
+ChamplainLayer *
 champlain_layer_new ()
 {
   ClutterGroup *layer;

diff --git a/champlain/champlainlayer.h b/champlain/champlainlayer.h
index 1bdf4cbc3bc88a86d846b0abffb408db5f47e291..0a18f31d7881377a3e836942f56a052e5126793f 100644 (file)
--- a/champlain/champlainlayer.h
+++ b/champlain/champlainlayer.h
@@ -24,6 +24,8 @@
 #include <glib-object.h>
 #include <clutter/clutter.h>
 
-ClutterActor *champlain_layer_new ();
+typedef ClutterActor ChamplainLayer;
+
+ChamplainLayer *champlain_layer_new ();
 
 #endif

diff --git a/configure.ac b/configure.ac
index ae66eb7a4d3cfcff3861ecaed80dd68807a384d6..93cda8465023b4e1e9c352b05dafef2a3d7bf2b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(libchamplain, 0.2.1, pierre-luc@squidy.info)
+AC_INIT(libchamplain, 0.2.2, pierre-luc@squidy.info)
 AC_CONFIG_SRCDIR([champlain/champlainview.h])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR(m4)
@@ -18,7 +18,7 @@ AC_PROG_CC
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
 # Checks for libraries.
-LIBRARY_VERSION=0:1:0
+LIBRARY_VERSION=1:2:0
 
 AC_SUBST(LIBRARY_VERSION)
 AC_SUBST(DEPS_CFLAGS)
@@ -42,6 +42,7 @@ AC_CONFIG_FILES([Makefile
                  champlain/Makefile
                  tidy/Makefile
                  docs/reference/Makefile
+                 docs/reference/version.xml
                  champlain.pc])
 AC_OUTPUT
 

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index dabd9fe1b408b298d5cb56bb9ea387ca4d20ab4d..83b9d2b262c00f8bc8b6501114bacf1847cbff2c 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -49,7 +49,7 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files= version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/docs/reference/libchamplain-docs.sgml b/docs/reference/libchamplain-docs.sgml
index a63dfd937c283450ce5f10d5ff32248cf5c6a74b..e63aa992f4fd346883bf33c886a84555d568a97f 100644 (file)
--- a/docs/reference/libchamplain-docs.sgml
+++ b/docs/reference/libchamplain-docs.sgml
@@ -1,11 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!ENTITY version SYSTEM "version.xml">
+]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>libchamplain Reference Manual</title>
     <releaseinfo>
-      for libchamplain 0.2
+      for libchamplain &version;
       The latest version of this documentation can be found on-line at
       <ulink role="online-location" url="http://blog.squidy.info/projects/libchamplain/">http://blog.squidy.info/projects/libchamplain/</ulink>.
     </releaseinfo>
@@ -14,6 +16,7 @@
   <chapter>
     <title>I. API Reference</title>
     <xi:include href="xml/champlainview.xml"/>
+    <xi:include href="xml/champlainlayer.xml"/>
     <xi:include href="xml/champlainmarker.xml"/>
   </chapter>
 </book>

diff --git a/docs/reference/libchamplain-sections.txt b/docs/reference/libchamplain-sections.txt
index c09e582115ef5b8a3a8af36f5c0f0859d66ce547..3178c0b3c81f7b59beeb957e9f50671cde10c4b5 100644 (file)
--- a/docs/reference/libchamplain-sections.txt
+++ b/docs/reference/libchamplain-sections.txt
@@ -28,6 +28,14 @@ champlain_marker_set_position
 <SUBSECTION Standard>
 </SECTION>
 
+<SECTION>
+<FILE>champlainlayer</FILE>
+<TITLE>ChamplainLayer</TITLE>
+<INCLUDE>champlain/champlainlayer.h</INCLUDE>
+champlain_layer_new
+<SUBSECTION Standard>
+</SECTION>
+
 <SECTION>
 <FILE>champlain</FILE>
 CHAMPLAIN_MIN_LAT

diff --git a/docs/reference/tmpl/champlainmarker.sgml b/docs/reference/tmpl/champlainmarker.sgml
index 1dc25a424469aef9452a4b8e58e601c9628087f2..d03dcea2a6f21167786ba201a16b92be93c317ad 100644 (file)
--- a/docs/reference/tmpl/champlainmarker.sgml
+++ b/docs/reference/tmpl/champlainmarker.sgml
@@ -27,14 +27,6 @@ A marker to identify points of interest on a map
 @group: 
 @priv: 
 
-<!-- ##### FUNCTION champlain_marker_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
 <!-- ##### FUNCTION champlain_marker_new ##### -->
 <para>
 
@@ -55,16 +47,6 @@ A marker to identify points of interest on a map
 @Returns: 
 
 
-<!-- ##### FUNCTION champlain_marker_set_anchor ##### -->
-<para>
-
-</para>
-
-@marker: 
-@x: 
-@y: 
-
-
 <!-- ##### FUNCTION champlain_marker_set_position ##### -->
 <para>
 

diff --git a/docs/reference/tmpl/champlainview.sgml b/docs/reference/tmpl/champlainview.sgml
index fa75da289de399f41ac0dacd6164e978adc9b7ca..97323869837468c7493b1ad342978c30b93bfad3 100644 (file)
--- a/docs/reference/tmpl/champlainview.sgml
+++ b/docs/reference/tmpl/champlainview.sgml
@@ -2,11 +2,11 @@
 ChamplainView
 
 <!-- ##### SECTION Short_Description ##### -->
-A widget to display maps
+A #ClutterActor to display maps
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-The #ChamplainView widget is a Clutter based widget to display maps.  It supports two modes of scrolling:
+The #ChamplainView is a ClutterActor to display maps.  It supports two modes of scrolling:
 <itemizedlist>
   <listitem><para>Push: the normal behavior where the maps doesn't move after the user stopped scrolling;</para></listitem>
   <listitem><para>Kinetic: the iPhone-like behavior where the maps decelerate after the user stopped scrolling.</para></listitem>
@@ -23,6 +23,7 @@ the user's cache dir under champlain). If an error occurs during download, an er
 <para>
 
 </para>
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
@@ -86,14 +87,6 @@ the user's cache dir under champlain). If an error occurs during download, an er
 
 </para>
 
-<!-- ##### FUNCTION champlain_view_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
 <!-- ##### FUNCTION champlain_view_new ##### -->
 <para>
 
@@ -109,8 +102,8 @@ the user's cache dir under champlain). If an error occurs during download, an er
 </para>
 
 @view: 
-@longitude: 
 @latitude: 
+@longitude: 
 
 
 <!-- ##### FUNCTION champlain_view_zoom_in ##### -->