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

	* Makefile.am:
	* clutter-gtk/Makefile.am:
	* examples/Makefile.am: Post-release bump build fixes

	* clutter-gtk/gtk-clutter-embed.c: Extend documentation.

diff --git a/ChangeLog b/ChangeLog
index b7070f9..5118d09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-29  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * Makefile.am:
+       * clutter-gtk/Makefile.am:
+       * examples/Makefile.am: Post-release bump build fixes
+
+       * clutter-gtk/gtk-clutter-embed.c: Extend documentation.
+
 2008-02-29  Matthew Allum  <mallum@openedhand.com>
 
        * clutter-gtk.pc.in:

diff --git a/Makefile.am b/Makefile.am
index be611e3..cb7efb9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS = clutter-gtk doc examples
 
-clutter-gtk-0.6.pc: clutter-gtk.pc
-       @cp -f clutter-gtk.pc clutter-gtk-0.6.pc
+clutter-gtk-0.7.pc: clutter-gtk.pc
+       @cp -f clutter-gtk.pc clutter-gtk-0.7.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = clutter-gtk-0.6.pc
+pkgconfig_DATA = clutter-gtk-0.7.pc
 
-CLEANFILES = clutter-gtk-0.6.pc
+CLEANFILES = clutter-gtk-0.7.pc
 
 DISTCLEANFILES = clutter-gtk.pc
 

diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index 2eeee5e..7adf979 100644 (file)
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -9,11 +9,11 @@ INCLUDES = \
        $(CLUTTER_CFLAGS)                       \
        $(GTK_CFLAGS)
 
-lib_LTLIBRARIES = libclutter-gtk-0.6.la
+lib_LTLIBRARIES = libclutter-gtk-0.7.la
 
-libclutter_gtk_0_6_la_SOURCES = gtk-clutter-embed.c
-libclutter_gtk_0_6_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
-libclutter_gtk_0_6_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+libclutter_gtk_0_7_la_SOURCES = gtk-clutter-embed.c
+libclutter_gtk_0_7_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+libclutter_gtk_0_7_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
 
-cluttergtkheadersdir = $(includedir)/clutter-0.6/clutter-gtk
+cluttergtkheadersdir = $(includedir)/clutter-0.7/clutter-gtk
 cluttergtkheaders_HEADERS = gtk-clutter-embed.h

diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
index 94594c0..092362e 100644 (file)
--- a/clutter-gtk/gtk-clutter-embed.c
+++ b/clutter-gtk/gtk-clutter-embed.c
@@ -28,15 +28,14 @@
  * a #GtkClutterEmbed widget is possible to build, show and interact with
  * a scene built using Clutter inside a GTK+ application.
  *
- * <note>You should never resize the #ClutterStage embedded into the
- * #GtkClutterEmbed widget. Instead, resize the widget using
- * gtk_widget_set_size_request().</note>
+ * There can be as many #GtkClutterEmbed widgets per application, but
+ * they will embed and show the same #ClutterStage as a general limitation
+ * of Clutter.
  *
- * <note>You should only call #clutter_actor_show_all() after the
- * widget itself has been shown</note>
- *
- * <note>Only a single #GtkClutterEmbed instace per application is
- * currently supported</note>
+ * <note>To avoid flickering on show, you should call gtk_widget_show()
+ * or gtk_widget_realize() before calling clutter_actor_show() on the
+ * embedded #ClutterStage actor. This is needed for Clutter to be able
+ * to paint on the #GtkClutterEmbed widget.</note>
  *
  * Since: 0.6
  */
@@ -96,7 +95,7 @@ gtk_clutter_embed_show (GtkWidget *widget)
   GtkClutterEmbedPrivate *priv = GTK_CLUTTER_EMBED (widget)->priv;
 
   /* Make sure the widget is realised before we show */
-  gtk_widget_realize(widget);
+  gtk_widget_realize (widget);
 
   GTK_WIDGET_CLASS (gtk_clutter_embed_parent_class)->show (widget);
 
@@ -305,7 +304,8 @@ gtk_clutter_embed_init (GtkClutterEmbed *embed)
  * This function should be called instead of #clutter_init() and after
  * #gtk_init()
  *
- * Return value: 1 on success, < 0 on failure.
+ * Return value: %CLUTTER_INIT_SUCCESS on success, a negative integer
+ *   on failure.
  *
  * Since: 0.8
  */
@@ -323,7 +323,8 @@ gtk_clutter_init (int *argc, char ***argv)
 /**
  * gtk_clutter_embed_new:
  *
- * Creates a new embedded Clutter widget.
+ * Creates a new #GtkClutterEmbed widget. This widget can be
+ * used to build a scene using Clutter API into a GTK+ application.
  *
  * Return value: the newly created #GtkClutterEmbed
  *

diff --git a/clutter-gtk/gtk-clutter-embed.h b/clutter-gtk/gtk-clutter-embed.h
index 67318cc..19eb7f7 100644 (file)
--- a/clutter-gtk/gtk-clutter-embed.h
+++ b/clutter-gtk/gtk-clutter-embed.h
@@ -24,6 +24,7 @@
 #define __GTK_CLUTTER_EMBED_H__
 
 #include <gtk/gtkwidget.h>
+#include <clutter/clutter-main.h>
 #include <clutter/clutter-actor.h>
 
 G_BEGIN_DECLS
@@ -79,7 +80,8 @@ GType         gtk_clutter_embed_get_type  (void) G_GNUC_CONST;
 GtkWidget *   gtk_clutter_embed_new       (void);
 ClutterActor *gtk_clutter_embed_get_stage (GtkClutterEmbed *embed);
 
-ClutterInitError gtk_clutter_init (int *argc, char ***argv);
+ClutterInitError gtk_clutter_init (gint    *argc,
+                                   gchar ***argv);
 
 G_END_DECLS
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5749513..79fa135 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -7,18 +7,18 @@ INCLUDES = \
        $(GTK_CFLAGS)
 
 gtk_clutter_test_DEPENDENCIES = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.6.la
+       $(top_builddir)/clutter-gtk/libclutter-gtk-0.7.la
 gtk_clutter_test_SOURCES = gtk-clutter-test.c
 gtk_clutter_test_LDADD = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.6.la \
+       $(top_builddir)/clutter-gtk/libclutter-gtk-0.7.la \
        $(CLUTTER_LIBS) \
        $(GTK_LIBS)
 
 gtk_clutter_events_DEPENDENCIES = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.6.la
+       $(top_builddir)/clutter-gtk/libclutter-gtk-0.7.la
 gtk_clutter_events_SOURCES = gtk-clutter-events.c
 gtk_clutter_events_LDADD = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.6.la \
+       $(top_builddir)/clutter-gtk/libclutter-gtk-0.7.la \
        $(CLUTTER_LIBS) \
        $(GTK_LIBS)