From 22d85a71fe615cf9bcbe97d776dfc41511cf567b Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Sun, 28 Sep 2008 11:03:43 -0400 Subject: [PATCH] Version bump and doc updates --- champlain/champlainlayer.c | 5 +++-- champlain/champlainlayer.h | 4 +++- configure.ac | 5 +++-- docs/reference/Makefile.am | 2 +- docs/reference/libchamplain-docs.sgml | 7 +++++-- docs/reference/libchamplain-sections.txt | 8 ++++++++ docs/reference/tmpl/champlainmarker.sgml | 18 ------------------ docs/reference/tmpl/champlainview.sgml | 15 ++++----------- 8 files changed, 27 insertions(+), 37 deletions(-) diff --git a/champlain/champlainlayer.c b/champlain/champlainlayer.c index e9ecbf0..8335d35 100644 --- a/champlain/champlainlayer.c +++ b/champlain/champlainlayer.c @@ -19,6 +19,7 @@ #include "config.h" +#include "champlainlayer.h" #include "champlain_defines.h" #include @@ -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 1bdf4cb..0a18f31 100644 --- a/champlain/champlainlayer.h +++ b/champlain/champlainlayer.h @@ -24,6 +24,8 @@ #include #include -ClutterActor *champlain_layer_new (); +typedef ClutterActor ChamplainLayer; + +ChamplainLayer *champlain_layer_new (); #endif diff --git a/configure.ac b/configure.ac index ae66eb7..93cda84 100644 --- 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 dabd9fe..83b9d2b 100644 --- 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 a63dfd9..e63aa99 100644 --- a/docs/reference/libchamplain-docs.sgml +++ b/docs/reference/libchamplain-docs.sgml @@ -1,11 +1,13 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + +]> libchamplain Reference Manual - for libchamplain 0.2 + for libchamplain &version; The latest version of this documentation can be found on-line at http://blog.squidy.info/projects/libchamplain/. @@ -14,6 +16,7 @@ I. API Reference + diff --git a/docs/reference/libchamplain-sections.txt b/docs/reference/libchamplain-sections.txt index c09e582..3178c0b 100644 --- a/docs/reference/libchamplain-sections.txt +++ b/docs/reference/libchamplain-sections.txt @@ -28,6 +28,14 @@ champlain_marker_set_position +
+champlainlayer +ChamplainLayer +champlain/champlainlayer.h +champlain_layer_new + +
+
champlain CHAMPLAIN_MIN_LAT diff --git a/docs/reference/tmpl/champlainmarker.sgml b/docs/reference/tmpl/champlainmarker.sgml index 1dc25a4..d03dcea 100644 --- 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: - - - - - -@Returns: - - @@ -55,16 +47,6 @@ A marker to identify points of interest on a map @Returns: - - - - - -@marker: -@x: -@y: - - diff --git a/docs/reference/tmpl/champlainview.sgml b/docs/reference/tmpl/champlainview.sgml index fa75da2..9732386 100644 --- a/docs/reference/tmpl/champlainview.sgml +++ b/docs/reference/tmpl/champlainview.sgml @@ -2,11 +2,11 @@ ChamplainView -A widget to display maps +A #ClutterActor to display maps -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: Push: the normal behavior where the maps doesn't move after the user stopped scrolling; Kinetic: the iPhone-like behavior where the maps decelerate after the user stopped scrolling. @@ -23,6 +23,7 @@ the user's cache dir under champlain). If an error occurs during download, an er + @@ -86,14 +87,6 @@ the user's cache dir under champlain). If an error occurs during download, an er - - - - - -@Returns: - - @@ -109,8 +102,8 @@ the user's cache dir under champlain). If an error occurs during download, an er @view: -@longitude: @latitude: +@longitude: -- 2.39.5