[clutter-gtkmm: 2/3] Use clutter-gtk-0.10.

[Murray Cumming <murrayc src gnome org>]

commit 9780e462f61f3b989a7c2ad4a20f1e47239d5c2c
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Aug 26 13:16:35 2009 +0200

    Use clutter-gtk-0.10.
    
    * configure.in: Use clutter-gtk-0.10 instead of clutter-gtk-0.9.
    * clutter-gtk/clutter-gtkmm/utility.cc: Handle the new GError parameter for
    gtk_clutter_texture_set_from_pixbuf/stock/icon_name().
    * clutter-gtk/clutter-gtkmm.pc.in: Use clutter-gtk-0.10.

 ChangeLog                            |    9 +++++++++
 clutter-gtk/clutter-gtkmm.pc.in      |    2 +-
 clutter-gtk/clutter-gtkmm/utility.cc |   15 ++++++++++++---
 configure.in                         |    2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 43d605a..44bc160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-26  Murray Cumming  <murrayc murrayc com>
+
+	Use clutter-gtk-0.10.
+	
+	* configure.in: Use clutter-gtk-0.10 instead of clutter-gtk-0.9.
+	* clutter-gtk/clutter-gtkmm/utility.cc: Handle the new GError parameter for 
+	gtk_clutter_texture_set_from_pixbuf/stock/icon_name().
+	* clutter-gtk/clutter-gtkmm.pc.in: Use clutter-gtk-0.10.
+
 0.9.4:
 
 2009-06-25  Murray Cumming  <murrayc murrayc com>
diff --git a/clutter-gtk/clutter-gtkmm.pc.in b/clutter-gtk/clutter-gtkmm.pc.in
index c47c975..830a3fa 100644
--- a/clutter-gtk/clutter-gtkmm.pc.in
+++ b/clutter-gtk/clutter-gtkmm.pc.in
@@ -5,7 +5,7 @@ includedir= includedir@
 
 Name: clutter-gtkmm
 Description: C++ wrapper for clutter
-Requires: clutter-gtk- API_VER@ cluttermm- API_VER@ gtkmm-2.4
+Requires: clutter-gtk-0.10 cluttermm- API_VER@ gtkmm-2.4
 Version: @VERSION@
 Libs: -L${libdir} -lclutter-gtkmm- API_VER@
 Cflags: -I${includedir}/clutter-gtkmm- API_VER@
diff --git a/clutter-gtk/clutter-gtkmm/utility.cc b/clutter-gtk/clutter-gtkmm/utility.cc
index a448e3e..8677e28 100644
--- a/clutter-gtk/clutter-gtkmm/utility.cc
+++ b/clutter-gtk/clutter-gtkmm/utility.cc
@@ -82,17 +82,26 @@ Glib::RefPtr<Texture> create_texture_from_icon_name(::Gtk::Widget& widget, const
 
 void set_texture_from_pixbuf(const Glib::RefPtr<Texture>& texture, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 {
-  gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj());
+  GError* error = 0;
+  gtk_clutter_texture_set_from_pixbuf(texture->gobj(), pixbuf->gobj(), &error);
+  if(error)
+    Glib::Error::throw_exception(error);
 }
 
 void set_texture_from_stock(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& stock_id, ::Gtk::IconSize size)
 {
-  gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)));
+  GError* error = 0;
+  gtk_clutter_texture_set_from_stock(texture->gobj(), widget.gobj(), stock_id.c_str(), GtkIconSize(int(size)), &error);
+  if(error)
+    Glib::Error::throw_exception(error);
 }
 
 void set_texture_from_icon_name(const Glib::RefPtr<Texture>& texture, ::Gtk::Widget& widget, const Glib::ustring& icon_name, ::Gtk::IconSize size)
 {
-  gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)));
+  GError* error = 0;
+  gtk_clutter_texture_set_from_icon_name(texture->gobj(), widget.gobj(), icon_name.c_str(), GtkIconSize(int(size)), &error);
+  if(error)
+    Glib::Error::throw_exception(error);
 }
 
 } //namespace Gtk
diff --git a/configure.in b/configure.in
index 0d61ba5..79d9e88 100644
--- a/configure.in
+++ b/configure.in
@@ -74,7 +74,7 @@ AC_CHECK_PROGS(PERL, perl5 perl)
 PKG_CHECK_MODULES(CLUTTER_GTKMM,
                   [gtkmm-2.4
                    cluttermm-0.9
-                   clutter-gtk-0.9 >= 0.9.1])
+                   clutter-gtk-0.10 >= 0.10.2])
 AC_SUBST(CLUTTER_GTKMM_CFLAGS)
 AC_SUBST(CLUTTER_GTKMM_LIBS)