gnome-games r8514 - trunk/gnometris

[chpe svn gnome org]

Author: chpe
Date: Tue Jan  6 18:21:02 2009
New Revision: 8514
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8514&view=rev

Log:
Use games-clutter-embed.

Modified:
   trunk/gnometris/field.cpp
   trunk/gnometris/main.cpp
   trunk/gnometris/preview.cpp
   trunk/gnometris/preview.h

Modified: trunk/gnometris/field.cpp
==============================================================================
--- trunk/gnometris/field.cpp	(original)
+++ trunk/gnometris/field.cpp	Tue Jan  6 18:21:02 2009
@@ -23,8 +23,8 @@
 #include "blocks.h"
 #include "renderer.h"
 
-#include <clutter-gtk/gtk-clutter-embed.h>
 #include <clutter-cairo/clutter-cairo.h>
+#include <libgames-support/games-clutter-embed.h>
 
 #define FONT "Sans Bold"
 
@@ -43,7 +43,7 @@
 	renderer = NULL;
 	rendererTheme = -1;
 
-	w = gtk_clutter_embed_new();
+	w = games_clutter_embed_new();
 
 	g_signal_connect (w, "configure_event", G_CALLBACK (configure), this);
 
@@ -80,7 +80,7 @@
 	} else {
 		background = clutter_cairo_new (w->allocation.width,
 						w->allocation.height);
-		stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (w));
+		stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (w));
 		/*FIXMEjclinton: eventually allow solid color background
 		 * for software rendering case */
 		ClutterColor stage_color = { 0x61, 0x64, 0x8c, 0xff };
@@ -102,7 +102,7 @@
 	} else {
 		foreground = clutter_cairo_new (w->allocation.width,
 						w->allocation.height);
-		stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (w));
+		stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (w));
 		clutter_group_add (CLUTTER_GROUP (stage),
 				   foreground);
 		clutter_actor_set_position (CLUTTER_ACTOR(foreground),

Modified: trunk/gnometris/main.cpp
==============================================================================
--- trunk/gnometris/main.cpp	(original)
+++ trunk/gnometris/main.cpp	Tue Jan  6 18:21:02 2009
@@ -27,7 +27,7 @@
 #include <libgames-support/games-runtime.h>
 
 #ifdef HAVE_CLUTTER
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <libgames-support/games-clutter-embed.h>
 #endif
 
 #include "tetris.h"
@@ -75,7 +75,7 @@
 	games_conf_initialise ("Gnometris");
 
 #ifdef HAVE_CLUTTER
-        if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) {
+        if (games_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;

Modified: trunk/gnometris/preview.cpp
==============================================================================
--- trunk/gnometris/preview.cpp	(original)
+++ trunk/gnometris/preview.cpp	Tue Jan  6 18:21:02 2009
@@ -45,7 +45,7 @@
 		}
 	}
 
-	w = gtk_clutter_embed_new();
+	w = games_clutter_embed_new();
 
 	g_signal_connect (w, "configure_event", G_CALLBACK (configure), this);
 

Modified: trunk/gnometris/preview.h
==============================================================================
--- trunk/gnometris/preview.h	(original)
+++ trunk/gnometris/preview.h	Tue Jan  6 18:21:02 2009
@@ -27,8 +27,8 @@
 #include "renderer.h"
 #include "blocks.h"
 
-#include <clutter-gtk/gtk-clutter-embed.h>
 #include <clutter-cairo/clutter-cairo.h>
+#include <libgames-support/games-clutter-embed.h>
 
 class Preview {
 public: