gnome-games r8234 - in trunk: aisleriot iagno

[thomashpa svn gnome org]

Author: thomashpa
Date: Mon Nov  3 23:35:23 2008
New Revision: 8234
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8234&view=rev

Log:
fix warning in iagno, remove duplicate include in aisleriot and reinsert HAVE_GNOME check for g_thread in aisleriot

Modified:
   trunk/aisleriot/game.c
   trunk/aisleriot/sol.c
   trunk/iagno/properties.c

Modified: trunk/aisleriot/game.c
==============================================================================
--- trunk/aisleriot/game.c	(original)
+++ trunk/aisleriot/game.c	Mon Nov  3 23:35:23 2008
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include <string.h>
-#include <string.h>
 #include <unistd.h>
 #include <time.h>
 

Modified: trunk/aisleriot/sol.c
==============================================================================
--- trunk/aisleriot/sol.c	(original)
+++ trunk/aisleriot/sol.c	Mon Nov  3 23:35:23 2008
@@ -681,7 +681,7 @@
 {
   setlocale (LC_ALL, "");
 
-#if defined(HAVE_RSVG_GNOMEVFS) || defined(HAVE_GSTREAMER)
+#if defined(HAVE_GNOME) || defined(HAVE_RSVG_GNOMEVFS) || defined(HAVE_GSTREAMER)
   /* If we're going to use gnome-vfs or gstreamer, we need to init threads before
    * calling any glib functions.
    */

Modified: trunk/iagno/properties.c
==============================================================================
--- trunk/iagno/properties.c	(original)
+++ trunk/iagno/properties.c	Mon Nov  3 23:35:23 2008
@@ -366,19 +366,22 @@
 static GtkWidget *
 fill_menu (void)
 {
-  const char *dname = NULL;
+  char *dir;
 
   /* FIXME: we need to check that both dname is valid and that
    * games_file_list_new_images returns something. */
 
-  dname = games_runtime_get_directory (GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY);
+  dir = g_strdup (games_runtime_get_directory (
+                    GAMES_RUNTIME_GAME_PIXMAP_DIRECTORY));
 
   if (theme_file_list)
     g_object_unref (theme_file_list);
 
-  theme_file_list = games_file_list_new_images (dname, NULL);
+  theme_file_list = games_file_list_new_images (dir, NULL);
 
   games_file_list_transform_basename (theme_file_list);
+ 
+  g_free (dir);
 
   return games_file_list_create_widget (theme_file_list, tile_set,
 					GAMES_FILE_LIST_REMOVE_EXTENSION |