Index: aisleriot/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-games/aisleriot/ChangeLog,v
retrieving revision 1.465
diff -u -r1.465 ChangeLog
--- aisleriot/ChangeLog	25 Aug 2006 16:20:11 -0000	1.465
+++ aisleriot/ChangeLog	25 Sep 2006 23:12:39 -0000
@@ -1,3 +1,7 @@
+2006-09-25  Tom Tromey  <tromey@redhat.com>
+
+	* sol.c (game_file_to_name): Remove unused '*'.  #347262.
+
 2006-08-25  Callum McKenzie  <callum@spooky-possum.org>
 
 	* rules/agnes.scm: Make Agnes winnable, patch in Bug #352499.  
Index: aisleriot/sol.c
===================================================================
RCS file: /cvs/gnome/gnome-games/aisleriot/sol.c,v
retrieving revision 1.139
diff -u -r1.139 sol.c
--- aisleriot/sol.c	7 Jul 2006 21:28:12 -0000	1.139
+++ aisleriot/sol.c	25 Sep 2006 23:12:39 -0000
@@ -1,5 +1,5 @@
 /* AisleRiot - sol.c
- * Copyright (C) 1998, 2001, 2003 Jonathan Blandford <jrb@alum.mit.edu>
+ * Copyright (C) 1998, 2001, 2003, 2006 Jonathan Blandford <jrb@alum.mit.edu>
  *
  * This game is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -99,7 +99,7 @@
   for (p = buf; p = strchr(p, ' '), p && *p;) {
     if (*(p+1)) {
       *(p+1) = g_ascii_toupper (*(p+1));
-      *p++;
+      p++;
     }
   }
   buf[0] = g_ascii_toupper (buf[0]);
Index: libgames-support/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-games/libgames-support/ChangeLog,v
retrieving revision 1.130
diff -u -r1.130 ChangeLog
--- libgames-support/ChangeLog	5 Sep 2006 16:36:28 -0000	1.130
+++ libgames-support/ChangeLog	25 Sep 2006 23:12:40 -0000
@@ -1,3 +1,10 @@
+2006-09-25  Tom Tromey  <tromey@redhat.com>
+
+	Bug #347262.
+	* games-preimage.c (games_preimage_new_from_file): Cast srcbuffer
+	pointer to char* first.
+	* games-files.c (games_file_list_find): Removed incorrect cast.
+
 2006-09-05  Andreas Røsdal  <andrearo@pvv.ntnu.no>
 
 	* Makefile.am:
Index: libgames-support/games-files.c
===================================================================
RCS file: /cvs/gnome/gnome-games/libgames-support/games-files.c,v
retrieving revision 1.12
diff -u -r1.12 games-files.c
--- libgames-support/games-files.c	5 May 2006 08:58:55 -0000	1.12
+++ libgames-support/games-files.c	25 Sep 2006 23:12:40 -0000
@@ -344,7 +344,7 @@
 {
   GList *element;
 
-  element = (gchar *)g_list_find_custom (filelist->list, userdata, function);
+  element = g_list_find_custom (filelist->list, userdata, function);
 
   return element ? g_strdup ((gchar *)element->data) : NULL;
 }
Index: libgames-support/games-preimage.c
===================================================================
RCS file: /cvs/gnome/gnome-games/libgames-support/games-preimage.c,v
retrieving revision 1.8
diff -u -r1.8 games-preimage.c
--- libgames-support/games-preimage.c	5 May 2006 08:58:55 -0000	1.8
+++ libgames-support/games-preimage.c	25 Sep 2006 23:12:40 -0000
@@ -186,7 +186,8 @@
     preimage->width     = info.width;
     preimage->height    = info.height;
 
-    if (!g_file_get_contents (filename, (gchar **)&(preimage->srcbuffer), 
+    if (!g_file_get_contents (filename,
+			      (gchar **)(char *)&(preimage->srcbuffer), 
 			      &(preimage->srcsize), error)) {
       g_object_unref (preimage);
       return NULL;
