gnome-games r8129 - trunk/aisleriot

[jclinton svn gnome org]

Author: jclinton
Date: Tue Oct 21 19:43:07 2008
New Revision: 8129
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8129&view=rev

Log:
Add Clutter build flags to Aisleriot. Make AisleRiotBoard inherit from
GtkClutterEmbed instead of GtkDrawingArea. Call gtk_clutter_init.

Modified:
   trunk/aisleriot/Makefile.am
   trunk/aisleriot/board.c
   trunk/aisleriot/sol.c

Modified: trunk/aisleriot/Makefile.am
==============================================================================
--- trunk/aisleriot/Makefile.am	(original)
+++ trunk/aisleriot/Makefile.am	Tue Oct 21 19:43:07 2008
@@ -50,8 +50,10 @@
 	$(AM_CPPFLAGS)
 
 sol_CFLAGS = \
-	$(GTK_CFLAGS)	\
-	$(GUILE_CFLAGS)	\
+	$(GTK_CFLAGS)	      \
+	$(CLUTTER_CFLAGS)     \
+	$(CLUTTER_GTK_CFLAGS) \
+	$(GUILE_CFLAGS)	      \
 	$(AM_CFLAGS)
 
 sol_LDFLAGS = \
@@ -59,7 +61,9 @@
 
 sol_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la	\
-	$(GTK_LIBS)	\
+	$(GTK_LIBS)	    \
+	$(CLUTTER_LIBS)     \
+	$(CLUTTER_GTK_LIBS) \
 	$(GUILE_LIBS)
 
 if HAVE_HILDON

Modified: trunk/aisleriot/board.c
==============================================================================
--- trunk/aisleriot/board.c	(original)
+++ trunk/aisleriot/board.c	Tue Oct 21 19:43:07 2008
@@ -27,6 +27,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include <clutter-gtk/gtk-clutter-embed.h>
+
 #include <libgames-support/games-card-images.h>
 #include <libgames-support/games-files.h>
 #include <libgames-support/games-marshal.h>
@@ -2177,7 +2179,7 @@
 
 /* Class implementation */
 
-G_DEFINE_TYPE (AisleriotBoard, aisleriot_board, GTK_TYPE_DRAWING_AREA);
+G_DEFINE_TYPE (AisleriotBoard, aisleriot_board, GTK_TYPE_CLUTTER_EMBED);
 
 /* AisleriotBoardClass methods */
 

Modified: trunk/aisleriot/sol.c
==============================================================================
--- trunk/aisleriot/sol.c	(original)
+++ trunk/aisleriot/sol.c	Tue Oct 21 19:43:07 2008
@@ -537,6 +537,8 @@
   games_sound_enable (FALSE);
   games_sound_add_option_group (option_context);
 
+  gtk_clutter_init (&argc, &argv);
+
   g_option_context_add_group (option_context, gtk_get_option_group (TRUE));
 #ifdef WITH_SMCLIENT
   g_option_context_add_group (option_context, egg_sm_client_get_option_group ());