gnome-games r8640 - trunk/aisleriot

[chpe svn gnome org]

Author: chpe
Date: Tue Feb  3 14:39:34 2009
New Revision: 8640
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8640&view=rev

Log:
-Wdeclaration-after-statement fixes.

Modified:
   trunk/aisleriot/board-noclutter.c
   trunk/aisleriot/board.c
   trunk/aisleriot/game.c
   trunk/aisleriot/slot-renderer.c

Modified: trunk/aisleriot/board-noclutter.c
==============================================================================
--- trunk/aisleriot/board-noclutter.c	(original)
+++ trunk/aisleriot/board-noclutter.c	Tue Feb  3 14:39:34 2009
@@ -1755,6 +1755,9 @@
   int focus_slot_index, new_focus_slot_index;
   int new_focus_slot_topmost_card_id, new_focus_card_id;
   gboolean is_rtl;
+#if GTK_CHECK_VERSION (2, 12, 0)
+  GtkDirectionType direction;
+#endif
 
   slots = aisleriot_game_get_slots (priv->game);
   if (!slots || slots->len == 0)
@@ -1782,8 +1785,6 @@
       return FALSE;
 
 #if GTK_CHECK_VERSION (2, 12, 0)
-    GtkDirectionType direction;
-
     if (count > 0) {
       direction = GTK_DIR_RIGHT;
     } else {

Modified: trunk/aisleriot/board.c
==============================================================================
--- trunk/aisleriot/board.c	(original)
+++ trunk/aisleriot/board.c	Tue Feb  3 14:39:34 2009
@@ -1831,6 +1831,9 @@
   int focus_slot_index, new_focus_slot_index;
   int new_focus_slot_topmost_card_id, new_focus_card_id;
   gboolean is_rtl;
+#if GTK_CHECK_VERSION (2, 12, 0)
+  GtkDirectionType direction;
+#endif
 
   slots = aisleriot_game_get_slots (priv->game);
   if (!slots || slots->len == 0)
@@ -1858,8 +1861,6 @@
       return FALSE;
 
 #if GTK_CHECK_VERSION (2, 12, 0)
-    GtkDirectionType direction;
-
     if (count > 0) {
       direction = GTK_DIR_RIGHT;
     } else {

Modified: trunk/aisleriot/game.c
==============================================================================
--- trunk/aisleriot/game.c	(original)
+++ trunk/aisleriot/game.c	Tue Feb  3 14:39:34 2009
@@ -293,7 +293,7 @@
   gboolean exception;
 } CallData;
 
-#define CALL_DATA_INIT  { 0, 0, 0, 0, 0, 0, 0 };
+#define CALL_DATA_INIT  { 0, 0, 0, 0, 0, 0, 0 }
 
 static char *
 cscmi_exception_get_backtrace (SCM tag, SCM throw_args)

Modified: trunk/aisleriot/slot-renderer.c
==============================================================================
--- trunk/aisleriot/slot-renderer.c	(original)
+++ trunk/aisleriot/slot-renderer.c	Tue Feb  3 14:39:34 2009
@@ -609,6 +609,7 @@
 
     if (anims[i].face_down != card.attr.face_down) {
       CoglHandle cogl_tex;
+      int center_x, center_y;
 
       cogl_tex = games_card_textures_cache_get_card_texture (priv->cache, card);
       if (G_UNLIKELY (cogl_tex == COGL_INVALID_HANDLE))
@@ -617,8 +618,8 @@
       card_width = cogl_texture_get_width (cogl_tex);
       card_height = cogl_texture_get_height (cogl_tex);
 
-      gint center_x = card_width / 2;
-      gint center_y = card_height / 2;
+      center_x = card_width / 2;
+      center_y = card_height / 2;
 
       clutter_actor_set_rotation (anim_data.card_tex, CLUTTER_Y_AXIS,
                                   180.0,