2008-10-20 Emmanuele Bassi <ebassi@linux.intel.com>

	* clutter-gtk/Makefile.am:
	* examples/Makefile.am: Update the build.

	* clutter-gtk/clutter-gtk.h: Added a single include header, and
	disabled the inclusion of specific headers; this keeps the
	library clean and future-proof, now that we have more than one
	header file.

	* clutter-gtk/gtk-clutter-embed.h:
	* clutter-gtk/gtk-clutter-util.h: Disabled the direct inclusion
	of a single header file.

	* clutter-gtk/gtk-clutter-scrollable.c:
	* clutter-gtk/gtk-clutter-scrollable.h: Added a GtkClutterScrollable
	interface for scrollable actors using GtkAdjustments.

	* clutter-gtk/gtk-clutter-viewport.c:
	* clutter-gtk/gtk-clutter-viewport.h: Added a scrollable actor
	implementing GtkClutterScrollable.

	* doc/reference/Makefile.am:
	* doc/reference/clutter-gtk-docs.sgml:
	* doc/reference/clutter-gtk-sections.txt:
	* doc/reference/clutter-gtk.types: Update the documentation.

	* examples/gtk-clutter-events.c:
	* examples/gtk-clutter-multistage.c:
	* examples/gtk-clutter-test.c: Update to include clutter-gtk.h.

	* examples/gtk-clutter-viewport.c: Added an example of
	the GtkClutterViewport usage.

4 files changed, 49 insertions, 2 deletions

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index f0e25a9..451b83c 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -47,7 +47,7 @@ CFILE_GLOB=$(top_srcdir)/clutter-gtk/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=
+IGNORE_HFILES=clutter-gtk.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff --git a/doc/reference/clutter-gtk-docs.sgml b/doc/reference/clutter-gtk-docs.sgml
index 0edd64e..c4b38d0 100644
--- a/doc/reference/clutter-gtk-docs.sgml
+++ b/doc/reference/clutter-gtk-docs.sgml
@@ -52,7 +52,13 @@
   </chapter>
 
   <chapter>
+    <title>Clutter-Gtk Actors</title>
+    <xi:include href="xml/gtk-clutter-viewport.xml"/>
+  </chapter>
+
+  <chapter>
     <title>Miscellaneous</title>
+    <xi:include href="xml/gtk-clutter-scrollable.xml"/>
     <xi:include href="xml/gtk-clutter-util.xml"/>
   </chapter>
 
diff --git a/doc/reference/clutter-gtk-sections.txt b/doc/reference/clutter-gtk-sections.txt
index c22095b..ee8cce9 100644
--- a/doc/reference/clutter-gtk-sections.txt
+++ b/doc/reference/clutter-gtk-sections.txt
@@ -43,3 +43,42 @@ gtk_clutter_texture_set_from_pixbuf
 gtk_clutter_texture_set_from_stock
 gtk_clutter_texture_set_from_icon_name
 </SECTION>
+
+<SECTION>
+<TITLE>GtkClutterScrollable</TITLE>
+<FILE>gtk-clutter-scrollable</FILE>
+GtkClutterScrollableIface
+gtk_clutter_scrollable_set_adjustments
+gtk_clutter_scrollable_get_adjustments
+
+<SUBSECTION Standard>
+GtkClutterScrollable
+GTK_TYPE_CLUTTER_SCROLLABLE
+GTK_CLUTTER_SCROLLABLE
+GTK_IS_CLUTTER_SCROLLABLE
+GTK_CLUTTER_SCROLLABLE_GET_IFACE
+<SUBSECTION Private>
+gtk_clutter_scrollable_get_type
+</SECTION>
+
+<SECTION>
+<TITLE>GtkClutterViewport</TITLE>
+<FILE>gtk-clutter-viewport</FILE>
+GtkClutterViewport
+GtkClutterViewportClass
+gtk_clutter_viewport_new
+gtk_clutter_viewport_get_origin
+gtk_clutter_viewport_get_originu
+
+<SUBSECTION Standard>
+GTK_TYPE_CLUTTER_VIEWPORT
+GTK_CLUTTER_VIEWPORT
+GTK_IS_CLUTTER_VIEWPORT
+GTK_CLUTTER_VIEWPORT_CLASS
+GTK_IS_CLUTTER_VIEWPORT_CLASS
+GTK_CLUTTER_VIEWPORT_GET_CLASS
+
+<SUBSECTION Private>
+GtkClutterViewportPrivate
+gtk_clutter_viewport_get_type
+</SECTION>
diff --git a/doc/reference/clutter-gtk.types b/doc/reference/clutter-gtk.types
index e2c581a..e4a1903 100644
--- a/doc/reference/clutter-gtk.types
+++ b/doc/reference/clutter-gtk.types
@@ -1,3 +1,5 @@
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 
 gtk_clutter_embed_get_type
+gtk_clutter_scrollable_get_type
+gtk_clutter_viewport_get_type