[gnome-games] [gnometris] Switch to new-style clutter includes and initialization

[Jason Clinton <jclinton src gnome org>]

commit 394d2ad53c870352f24b7652c76268b911ec4e69
Author: Jason D. Clinton <me jasonclinton com>
Date:   Sun Apr 26 17:49:07 2009 -0500

    [gnometris] Switch to new-style clutter includes and initialization
    
    clutter-0.9 renamed a few headers and has required that all includes be
    done as clutter.h and clutter-gtk.h
---
 gnometris/blockops.cpp |    2 +-
 gnometris/main.cpp     |    4 ++--
 gnometris/preview.h    |    2 +-
 gnometris/renderer.h   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnometris/blockops.cpp b/gnometris/blockops.cpp
index 3ce5e9f..c640869 100644
--- a/gnometris/blockops.cpp
+++ b/gnometris/blockops.cpp
@@ -22,7 +22,7 @@
 #include <config.h>
 #include "blockops.h"
 #include "blocks.h"
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 
 #define FONT "Sans Bold"
 
diff --git a/gnometris/main.cpp b/gnometris/main.cpp
index e8cab66..78e18db 100644
--- a/gnometris/main.cpp
+++ b/gnometris/main.cpp
@@ -25,7 +25,7 @@
 #include <libgames-support/games-sound.h>
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-runtime.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 
 #include "tetris.h"
 
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
 
 	games_conf_initialise ("Gnometris");
 
-        if (gtk_clutter_init_with_args (NULL, NULL, NULL, NULL, NULL, &error) != CLUTTER_INIT_SUCCESS) {
+	if (clutter_init_with_args (NULL, NULL, NULL, NULL, NULL, &error) != CLUTTER_INIT_SUCCESS) {
 		g_printerr ("Failed to initialise clutter: %s\n", error->message);
 		g_error_free (error);
 		return 1;
diff --git a/gnometris/preview.h b/gnometris/preview.h
index 86795f9..60d16b9 100644
--- a/gnometris/preview.h
+++ b/gnometris/preview.h
@@ -28,7 +28,7 @@
 #include "blocks.h"
 
 #include <clutter/clutter.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 
 class Preview {
 public:
diff --git a/gnometris/renderer.h b/gnometris/renderer.h
index 824e6e0..c647634 100644
--- a/gnometris/renderer.h
+++ b/gnometris/renderer.h
@@ -26,7 +26,7 @@
 
 #include <cairo.h>
 #include <glib.h>
-#include <clutter-cairo/clutter-cairo.h>
+#include <clutter/clutter.h>
 
 #include "blocks.h"
 #include "tetris.h"