gnome-games r8608 - trunk/aisleriot

[chpe svn gnome org]

Author: chpe
Date: Wed Jan 21 21:50:04 2009
New Revision: 8608
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8608&view=rev

Log:
Fix compile warnings about using potentially uninitialised data.

Modified:
   trunk/aisleriot/board-noclutter.c
   trunk/aisleriot/game.c
   trunk/aisleriot/sol.c

Modified: trunk/aisleriot/board-noclutter.c
==============================================================================
--- trunk/aisleriot/board-noclutter.c	(original)
+++ trunk/aisleriot/board-noclutter.c	Wed Jan 21 21:50:04 2009
@@ -2608,8 +2608,8 @@
         count = -1;
         break;
       default:
-        g_assert_not_reached();
-        break;
+	/* FIXME: can this happen? */
+	return GTK_WIDGET_CLASS (aisleriot_board_parent_class)->focus (widget, direction);
     }
 
     return aisleriot_board_move_cursor_start_end_by_slot (board, -count);

Modified: trunk/aisleriot/game.c
==============================================================================
--- trunk/aisleriot/game.c	(original)
+++ trunk/aisleriot/game.c	Wed Jan 21 21:50:04 2009
@@ -402,7 +402,7 @@
 {
   CallData *data = (CallData *) user_data;
   AisleriotGame *game = app_game;
-  char *message;
+  char *message = NULL;
   int error_fd;
   char *error_file = NULL;
   GError *error = NULL;

Modified: trunk/aisleriot/sol.c
==============================================================================
--- trunk/aisleriot/sol.c	(original)
+++ trunk/aisleriot/sol.c	Wed Jan 21 21:50:04 2009
@@ -657,14 +657,14 @@
 
   aisleriot_conf_shutdown ();
 
-  cleanup:
-  g_free (data.variation);
-
 #ifdef WITH_SMCLIENT
   g_signal_handlers_disconnect_matched (sm_client, G_SIGNAL_MATCH_DATA,
                                         0, 0, NULL, NULL, &data);
 #endif /* WITH_SMCLIENT */
 
+cleanup:
+  g_free (data.variation);
+
 #ifdef HAVE_MAEMO
   if (data.program != NULL) {
     g_object_unref (data.program);