Port to Clutter 1.0 and libchamplain 0.3.6

diff --git a/configure.ac b/configure.ac
index 7b40c74aa895d083bdff9e2361f2a37cc54eec1a..3484e3cd39a9cb5e1df0cda172ac47ef21f235f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,9 +35,9 @@ ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
 LIBCANBERRA_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.3.3
-LIBCHAMPLAIN_GTK_REQUIRED=0.3.3
-CLUTTER_GTK_REQUIRED=0.8.2
+LIBCHAMPLAIN_REQUIRED=0.3.6
+LIBCHAMPLAIN_GTK_REQUIRED=0.3.6
+CLUTTER_GTK_REQUIRED=0.10
 GEOCLUE_REQUIRED=0.11
 WEBKIT_REQUIRED=1.1.7
 NETWORK_MANAGER_REQUIRED=0.7.0
@@ -259,7 +259,7 @@ if test "x$enable_map" != "xno"; then
    [
       champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
       champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
    ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then

diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index 86e15bdfff0ec9ac41b5d73a4e835c15fd4977f9..e4800adc1778f05a6dea90dfba2c0b57196186cc 100644 (file)
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -26,7 +26,7 @@
 
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-contact.h>
@@ -190,7 +190,8 @@ map_view_contacts_foreach (GtkTreeModel *model,
   if (avatar != NULL)
     {
       texture = clutter_texture_new ();
-      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar);
+      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar,
+          NULL);
       champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture);
       g_object_unref (avatar);
     }

diff --git a/src/empathy.c b/src/empathy.c
index 4ff0918fd81158a5292b869863c03f5501451ce7..15155d28d5fda439a9ac7af88705a742cc42a0a6 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -32,7 +32,7 @@
 #include <gdk/gdkx.h>
 
 #if HAVE_LIBCHAMPLAIN
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #endif
 
 #include <libebook/e-book.h>