[aisleriot] Fix shadow warnings

[Christian Persch <chpe src gnome org>]

commit d2e26c3302b95d34a1eba483ae558acd0a46fea5
Author: Christian Persch <chpe gnome org>
Date:   Mon Nov 21 13:44:17 2011 +0100

    Fix shadow warnings

 src/board-noclutter.c |    1 -
 src/game.c            |   16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/board-noclutter.c b/src/board-noclutter.c
index 25c2a75..d820e0f 100644
--- a/src/board-noclutter.c
+++ b/src/board-noclutter.c
@@ -3111,7 +3111,6 @@ draw_cards:
 #endif /* OPTIMISED_EXPOSE */
   {
     GdkRectangle card_rect;
-    cairo_pattern_t *pattern;
 
     get_rect_by_slot_and_card (board,
                                priv->show_card_slot,
diff --git a/src/game.c b/src/game.c
index 80009d2..390a88e 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1793,7 +1793,7 @@ game_scm_new_game (void *user_data)
  */
 static void
 aisleriot_game_new_game_internal (AisleriotGame *game,
-                                  GRand *rand,
+                                  GRand *g_rand,
                                   gboolean count_loss)
 {
   GObject *object = G_OBJECT (game);
@@ -1820,11 +1820,11 @@ aisleriot_game_new_game_internal (AisleriotGame *game,
     update_statistics (game);
   }
 
-  if (rand != NULL) {
+  if (g_rand != NULL) {
     if (game->rand)
       g_rand_free (game->rand);
 
-    game->rand = rand; /* adopted */
+    game->rand = g_rand; /* adopted */
   } else if (game->rand == NULL) {
     game->rand = g_rand_new ();
   }
@@ -1883,9 +1883,9 @@ aisleriot_game_new_game (AisleriotGame *game)
  */
 void
 aisleriot_game_new_game_with_rand (AisleriotGame *game,
-                                   GRand *rand)
+                                   GRand *g_rand)
 {
-  aisleriot_game_new_game_internal (game, rand, TRUE);
+  aisleriot_game_new_game_internal (game, g_rand, TRUE);
 }
 
 /**
@@ -1897,12 +1897,12 @@ aisleriot_game_new_game_with_rand (AisleriotGame *game,
 void
 aisleriot_game_restart_game (AisleriotGame *game)
 {
-  GRand *rand;
+  GRand *g_rand;
 
-  rand = game->saved_rand;
+  g_rand = game->saved_rand;
   game->saved_rand = NULL;
 
-  aisleriot_game_new_game_internal (game, rand, FALSE);
+  aisleriot_game_new_game_internal (game, g_rand, FALSE);
 }
 
 /**