2008-02-08 Emmanuele Bassi <ebassi@openedhand.com>

	* clutter/clutter-behaviour-path.c: Reference the newly
	added image showing the effects of different alpha functions
	on the same path behaviour.

	* configure.ac: Find out the prefix of some of the libraries
	we depend upon, so that gtk-doc can fix the references for us.

diff --git a/ChangeLog b/ChangeLog
index 0a03fa6..a5e616c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-08  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * clutter/clutter-behaviour-path.c: Reference the newly
+       added image showing the effects of different alpha functions
+       on the same path behaviour.
+
+       * configure.ac: Find out the prefix of some of the libraries
+       we depend upon, so that gtk-doc can fix the references for us.
+
 2008-02-08  Matthew Allum  <mallum@openedhand.com>
 
        * clutter/clutter-texture.c:

diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c
index e718620..7147128 100644 (file)
--- a/clutter/clutter-alpha.c
+++ b/clutter/clutter-alpha.c
@@ -97,7 +97,7 @@ timeline_new_frame_cb (ClutterTimeline *timeline,
 
       g_object_notify (G_OBJECT (alpha), "alpha");
       g_object_unref (alpha);
-  }
+    }
 }
 
 static void 

diff --git a/clutter/clutter-behaviour-path.c b/clutter/clutter-behaviour-path.c
index 6fa49b4..63099a5 100644 (file)
--- a/clutter/clutter-behaviour-path.c
+++ b/clutter/clutter-behaviour-path.c
@@ -40,6 +40,11 @@
  * knot in the path is reached with the upper bound value provided by
  * the #ClutterAlpha object used by the behaviour.
  *
+ * <figure id="behaviour-path-alpha">
+ *   <title>Effects of alpha functions on a path</title>
+ *   <graphic fileref="path-alpha-func.png" format="PNG"/>
+ * </figure>
+ *
  * #ClutterBehaviourPath is available since Clutter 0.2
  */
 

diff --git a/configure.ac b/configure.ac
index ae7198c..793da99 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -310,6 +310,14 @@ PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES])
 
 AC_SUBST(CLUTTER_REQUIRES)
 
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
+GDKPIXBUF_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
+
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(PANGO_PREFIX)
+AC_SUBST(GDKPIXBUF_PREFIX)
+
 dnl ========================================================================
 
 if test "x$GCC" = "xyes"; then