gnome-games r8952 - in branches/clutter-0-9: aisleriot gnometris libgames-support

[jclinton svn gnome org]

Author: jclinton
Date: Mon Mar 30 01:25:03 2009
New Revision: 8952
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8952&view=rev

Log:
Remove our private copy of gtk-clutter-embed.h and rename all calls to it

This is due new features upstream, API changes and a lack of desire to
maintain our own private copy. Our private copy did not have any
features over the newest fixed upstream anyways after upstream fixed our
reported issues.

Removed:
   branches/clutter-0-9/libgames-support/games-clutter-embed.c
   branches/clutter-0-9/libgames-support/games-clutter-embed.h
Modified:
   branches/clutter-0-9/aisleriot/board.c
   branches/clutter-0-9/aisleriot/sol.c
   branches/clutter-0-9/gnometris/main.cpp
   branches/clutter-0-9/libgames-support/Makefile.am

Modified: branches/clutter-0-9/aisleriot/board.c
==============================================================================
--- branches/clutter-0-9/aisleriot/board.c	(original)
+++ branches/clutter-0-9/aisleriot/board.c	Mon Mar 30 01:25:03 2009
@@ -28,7 +28,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <clutter/clutter.h>
-// #include <clutter-gtk/gtk-clutter-util.h>
 
 #include <libgames-support/games-card-textures-cache.h>
 #include <libgames-support/games-clutter-embed.h>
@@ -415,7 +414,7 @@
   if (priv->baize_actor == NULL) {
     ClutterActor *stage;
 
-    stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+    stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
 
     priv->baize_actor = g_object_ref_sink (aisleriot_baize_new ());
     clutter_container_add (CLUTTER_CONTAINER (stage),
@@ -1038,7 +1037,7 @@
   AisleriotBoardPrivate *priv = board->priv;
   ClutterActor *stage;
 
-  stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+  stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
 
   if (!priv->geometry_set)
     return;
@@ -1263,7 +1262,7 @@
   slot_update_card_images (board, hslot);
   aisleriot_game_reset_old_cards (hslot);
 
-  stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+  stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
   clutter_container_add (CLUTTER_CONTAINER (stage),
                          priv->moving_cards_group, NULL);
 
@@ -2299,7 +2298,7 @@
 
 /* Class implementation */
 
-G_DEFINE_TYPE (AisleriotBoard, aisleriot_board, GAMES_TYPE_CLUTTER_EMBED);
+G_DEFINE_TYPE (AisleriotBoard, aisleriot_board, GTK_TYPE_CLUTTER_EMBED);
 
 /* AisleriotBoardClass methods */
 
@@ -3192,7 +3191,7 @@
   gtk_widget_tap_and_hold_setup (widget, NULL, NULL, GTK_TAP_AND_HOLD_PASS_PRESS);
 #endif
 
-  stage = games_clutter_embed_get_stage (GAMES_CLUTTER_EMBED (board));
+  stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (board));
   priv->animation_layer = g_object_ref_sink (clutter_group_new ());
   clutter_container_add (CLUTTER_CONTAINER (stage),
                          priv->animation_layer, NULL);

Modified: branches/clutter-0-9/aisleriot/sol.c
==============================================================================
--- branches/clutter-0-9/aisleriot/sol.c	(original)
+++ branches/clutter-0-9/aisleriot/sol.c	Mon Mar 30 01:25:03 2009
@@ -32,6 +32,7 @@
 
 #ifdef HAVE_CLUTTER
 #include <clutter/clutter.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
 #endif
 
 #ifdef HAVE_HILDON
@@ -71,10 +72,6 @@
 #include "util.h"
 #include "window.h"
 
-#ifdef HAVE_CLUTTER
-#include <libgames-support/games-clutter-embed.h>
-#endif
-
 typedef struct {
   AisleriotWindow *window;
   char *variation;

Modified: branches/clutter-0-9/gnometris/main.cpp
==============================================================================
--- branches/clutter-0-9/gnometris/main.cpp	(original)
+++ branches/clutter-0-9/gnometris/main.cpp	Mon Mar 30 01:25:03 2009
@@ -27,7 +27,7 @@
 #include <libgames-support/games-runtime.h>
 
 #ifdef HAVE_CLUTTER
-#include <libgames-support/games-clutter-embed.h>
+#include <clutter-gtk/gtk-clutter-embed.h>
 #endif
 
 #include "tetris.h"

Modified: branches/clutter-0-9/libgames-support/Makefile.am
==============================================================================
--- branches/clutter-0-9/libgames-support/Makefile.am	(original)
+++ branches/clutter-0-9/libgames-support/Makefile.am	Mon Mar 30 01:25:03 2009
@@ -110,8 +110,6 @@
 libgames_support_la_SOURCES += \
 	games-card-textures-cache.c	\
 	games-card-textures-cache.h	\
-	games-clutter-embed.c		\
-	games-clutter-embed.h		\
 	$(NULL)
 endif