[libchamplain] Clutter 1.0 migration (no more clutter-cairo)

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit 2d082d4818bd33177b1b8087f5946d34b7a316d8
Author: Simon Wenner <simon wenner ch>
Date:   Thu Aug 20 12:25:36 2009 +0200

    Clutter 1.0 migration (no more clutter-cairo)

 champlain/champlain-map-source.c         |    1 -
 champlain/champlain-memphis-map-source.c |    5 ++---
 demos/local-rendering.c                  |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c
index d14ea27..a42c33b 100644
--- a/champlain/champlain-map-source.c
+++ b/champlain/champlain-map-source.c
@@ -47,7 +47,6 @@
 #include <glib-object.h>
 #include <math.h>
 #include <string.h>
-#include <clutter-cairo.h>
 
 void champlain_map_source_real_fill_tile (ChamplainMapSource *map_source,
     ChamplainTile *tile);
diff --git a/champlain/champlain-memphis-map-source.c b/champlain/champlain-memphis-map-source.c
index 19ea895..0e469fa 100644
--- a/champlain/champlain-memphis-map-source.c
+++ b/champlain/champlain-memphis-map-source.c
@@ -52,7 +52,6 @@
 
 #include <errno.h>
 #include <string.h>
-#include <clutter-cairo.h>
 
 /* Tuning parameters */
 #define MAX_THREADS 4
@@ -311,9 +310,9 @@ set_tile_content (gpointer data)
 
   /* draw the clutter texture */
   size = champlain_tile_get_size (tile);
-  actor = clutter_cairo_new (size, size);
+  actor = clutter_cairo_texture_new (size, size);
 
-  cr_clutter = clutter_cairo_create (CLUTTER_CAIRO(actor));
+  cr_clutter = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (actor));
   cairo_set_source_surface (cr_clutter, cst, 0, 0);
   cairo_paint (cr_clutter);
   cairo_destroy (cr_clutter);
diff --git a/demos/local-rendering.c b/demos/local-rendering.c
index 6e93daa..e81cf2e 100644
--- a/demos/local-rendering.c
+++ b/demos/local-rendering.c
@@ -20,7 +20,7 @@
 #include <gtk/gtk.h>
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 
 #define N_COLS 2
 #define COL_ID 0